fixed rootfs/usr/bin and pip installing python packages

TyberiusPrime · Oct 27, 2021 · 4a9f124 · 4a9f124
1 parent 7584072
commit 4a9f124
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "anysnake2"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Florian Finkernagel <[email protected]>"]
 edition = "2018"
 

diff --git a/src/flake_template.nix b/src/flake_template.nix
@@ -42,7 +42,7 @@
               touch $out/rootfs/etc/group
 
               mkdir -p $out/rootfs/{bin,etc,share}
-              mkdir -p $out/rootfs/usr/{bin,lib/share}
+              mkdir -p $out/rootfs/usr/{lib/share}
               for path in "${mypy2}/bin/"*;
                 do
                   ln -s $path $out/rootfs/bin/

diff --git a/src/main.rs b/src/main.rs
@@ -982,7 +982,7 @@ fn fill_venv(
                     &safe_pkg
                 ),
             ];
-            singularity_args.push(flake_dir.join("/result/rootfs").to_string_lossy());
+            singularity_args.push(flake_dir.join("result/rootfs").to_string_lossy());
             singularity_args.push("bash".into());
             singularity_args.push("-c".into());
             singularity_args.push(format!(