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

Added libPackages

This commit is contained in:
Jan-Bulthuis 2025-02-10 00:31:08 +01:00
parent 299813134e
commit e1d061ffbf
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell-modules/default.nix
View File

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

10
shell-modules/shell.nix
View File

@ -24,6 +24,16 @@ with lib;
description = "Extra packages to install"; description = "Extra packages to install";
}; };
libPackages = mkOption {
type = types.functionTo (types.listOf types.package) // {
merge =
loc: defs: p:
lib.concatMap (def: (def.value p)) defs;
};
default = p: [ ];
description = "Packages to install and add to library path";
};
override = mkOption { override = mkOption {
type = types.attrs; type = types.attrs;
default = { }; default = { };