Jan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrote if statement around defining LD_LIBRARY_PATH

This commit is contained in:
Jan-Bulthuis 2025-02-10 00:33:28 +01:00
parent e1d061ffbf
commit 3ae7a5e8d4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shell-modules/default.nix
View File

@ -34,9 +34,16 @@ in
recUpdate = nixpkgs.lib.recursiveUpdate; recUpdate = nixpkgs.lib.recursiveUpdate;
libPackages = evaluated.libPackages pkgs; libPackages = evaluated.libPackages pkgs;
shell = recUpdate { shell = recUpdate {
env = evaluated.env // { env =
LD_LIBRARY_PATH = (nixpkgs.lib.mkIf (libPackages != [ ]) (nixpkgs.lib.makeLibraryPath libPackages)); evaluated.env
}; // (
if (libPackages != [ ]) then
{
LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath libPackages;
}
else
{ }
);
packages = evaluated.packages ++ (evaluated.extraPackages pkgs) ++ libPackages; packages = evaluated.packages ++ (evaluated.extraPackages pkgs) ++ libPackages;
} evaluated.override; } evaluated.override;
in in