public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow { pkgs, pkgsOrig, ... } : in config.nix

Browse Source 
svn path=/nixpkgs/trunk/; revision=14700
This commit is contained in:
Marc Weber 2009-03-25 13:29:47 +00:00
parent 5b89240b84
commit e1c1ecf33a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/top-level/all-packages.nix
View File

@ -49,12 +49,19 @@ let
homeDir = getEnv "HOME"; homeDir = getEnv "HOME";
configFile2 = homeDir + "/.nixpkgs/config.nix"; configFile2 = homeDir + "/.nixpkgs/config.nix";
body = configExpr =
if configFile != "" && pathExists configFile if configFile != "" && pathExists configFile
then import (toPath configFile) then import (toPath configFile)
else if homeDir != "" && pathExists configFile2 else if homeDir != "" && pathExists configFile2
then import (toPath configFile2) then import (toPath configFile2)
else {}; else {};
# allow both:
# { /* the config */ } and
# { pkgsOrig, pkgs, ... } : { /* the config */ }
body = if builtins.isFunction configExpr
then configExpr { inherit pkgs pkgsOrig; }
else configExpr;
}; };
# Return an attribute from the Nixpkgs configuration file, or # Return an attribute from the Nixpkgs configuration file, or