fix: solve the path issue of mkDevOCI

divnix · Aug 11, 2023 · ec2d87c · ec2d87c
1 parent ac0909b
commit ec2d87c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/lib/ops/mkDevOCI.nix b/src/lib/ops/mkDevOCI.nix
@@ -92,8 +92,8 @@ in
 
         # Enable nix flakes
         mkdir -p $out/etc
-        echo "sandbox = false" > $out/etc/nix.conf
-        echo "accept-flake-config = true" > $out/etc/nix.conf
+        echo "sandbox = false" >> $out/etc/nix.conf
+        echo "accept-flake-config = true" >> $out/etc/nix.conf
         echo "experimental-features = nix-command flakes" >> $out/etc/nix.conf
 
         # Increase warn timeout and whitelist all paths

diff --git a/src/lib/ops/mkOCI.nix b/src/lib/ops/mkOCI.nix
@@ -78,7 +78,16 @@ in
             [
               (nixpkgs.buildEnv {
                 name = "root";
-                paths = [setupLinks] ++ setup;
+                paths =
+                  setup
+                  ++ [
+                    # prevent the $out`/bin` to be a symlink
+                    (nixpkgs.runCommand "setupDirs" {}
+                      ''
+                        mkdir -p $out/bin
+                      '')
+                    setupLinks
+                  ];
               })
             ]
             ++ options.copyToRoot or [];