Skip to content

Commit

Permalink
bugfix: no longer put the dependencies of requested programs into the…
Browse files Browse the repository at this point in the history
… /bin path
  • Loading branch information
TyberiusPrime committed May 7, 2024
1 parent 11a92df commit 4515b32
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ examples/**/venv
hello_flake
examples/flake_in_non_root_github/no-home/*
activate_github_token.fish
target*/
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "anysnake2"
version = "1.15.1"
version = "1.15.2"
authors = ["Florian Finkernagel <[email protected]>"]
edition = "2021"

Expand Down
18 changes: 9 additions & 9 deletions src/flake_template.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@
${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/share $out/rootfs/usr/share/ || true
${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/library $out/rootfs/R_libs/ || true
done
# is it smart to symlink the dependencies as well?
for path in $(cat ${pkgs.writeReferencesToFile [script_file]});
do
${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/bin $out/rootfs/bin/ || true
${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/etc $out/rootfs/etc || true
${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/lib $out/rootfs/usr/lib/ || true
${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/share $out/rootfs/usr/share/ || true
${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/library $out/rootfs/R_libs/ || true
done
# # is it smart to symlink the dependencies as well?
# for path in $(cat ${pkgs.writeReferencesToFile [script_file]});
# do
# ${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/bin $out/rootfs/bin/ || true
# ${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/etc $out/rootfs/etc || true
# ${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/lib $out/rootfs/usr/lib/ || true
# ${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/share $out/rootfs/usr/share/ || true
# ${pkgs.xorg.lndir}/bin/lndir -ignorelinks $path/library $out/rootfs/R_libs/ || true
# done
ln -s $out/rootfs/bin $out/rootfs/usr/bin
#mkdir $out/python_env
Expand Down

0 comments on commit 4515b32

Please sign in to comment.