dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Changing the way 'platform' gets into all-packages, allowing setting it in nixpkgs config.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23635
This commit is contained in:
Lluís Batlle i Rossell 2010-09-03 21:34:49 +00:00
parent 23b5b032de
commit 0a1dcea515
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,11 +32,11 @@
config ? null
, crossSystem ? null
, platform ? (import ./platforms.nix).pc
, platform ? null
}:
let config_ = config; in # rename the function argument
let config_ = config; platform_ = platform; in # rename the function arguments
let
@ -70,6 +70,10 @@ let
then configExpr { inherit pkgs pkgsOrig; }
else configExpr;
# Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc)
platform = if platform_ != null then platform_
else getConfig [ "platform" ] (import ./platforms.nix).pc;
# Return an attribute from the Nixpkgs configuration file, or
# a default value if the attribute doesn't exist.
getConfig = attrPath: default: lib.attrByPath attrPath default config;