Merge pull request #102 from DeterminateSystems/colemickens/fallback

nix.conf: move write for 'fallback', always set it
DeterminateSystems · Sep 16, 2024 · 5b126b6 · 5b126b6
2 parents f13fa9e + 2bcd866
commit 5b126b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/magic-nix-cache/src/main.rs b/magic-nix-cache/src/main.rs
@@ -222,6 +222,11 @@ async fn main_cli() -> Result<()> {
         .open(&nix_conf_path)
         .with_context(|| "Creating nix.conf")?;
 
+    // always enable fallback, first
+    nix_conf
+        .write_all(b"fallback = true\n")
+        .with_context(|| "Setting fallback in nix.conf")?;
+
     let store = Arc::new(NixStore::connect()?);
 
     let narinfo_negative_cache = Arc::new(RwLock::new(HashSet::new()));

diff --git a/magic-nix-cache/src/pbh.rs b/magic-nix-cache/src/pbh.rs
@@ -186,13 +186,7 @@ pub async fn setup_legacy_post_build_hook(
 
     /* Update nix.conf. */
     nix_conf
-        .write_all(
-            format!(
-                "fallback = true\npost-build-hook = {}\n",
-                post_build_hook_script.display()
-            )
-            .as_bytes(),
-        )
+        .write_all(format!("post-build-hook = {}\n", post_build_hook_script.display()).as_bytes())
         .with_context(|| "Writing to nix.conf")?;
 
     Ok(())