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

GNU: Use `callPackage'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33649
This commit is contained in:
Ludovic Courtès 2012-04-06 13:18:58 +00:00
parent 9f2068ac9b
commit e24eab9b87
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/gnu/default.nix
View File

@ -12,7 +12,7 @@ let
callPackage = newScope gnu; callPackage = newScope gnu;
gnu = { gnu = {
hurdCross = forceBuildDrv(import ./hurd { hurdCross = forceBuildDrv(callPackage ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo inherit fetchgit stdenv autoconf libtool texinfo
glibcCross hurdPartedCross; glibcCross hurdPartedCross;
inherit (gnu) machHeaders mig; inherit (gnu) machHeaders mig;
@ -23,9 +23,11 @@ let
gccCross = gccCrossStageFinal; gccCross = gccCrossStageFinal;
}); });
hurdCrossIntermediate = forceBuildDrv(import ./hurd { hurdCrossIntermediate = forceBuildDrv(callPackage ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo glibcCross; inherit fetchgit stdenv autoconf libtool texinfo glibcCross;
inherit (gnu) machHeaders mig; inherit (gnu) machHeaders mig;
hurdPartedCross = null;
libuuid = null;
automake = automake111x; automake = automake111x;
headersOnly = false; headersOnly = false;
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
@ -56,7 +58,7 @@ let
hurd = null; hurd = null;
}; };
libpthreadCross = forceBuildDrv(import ./libpthread { libpthreadCross = forceBuildDrv(callPackage ./libpthread {
inherit fetchgit stdenv autoconf automake libtool glibcCross; inherit fetchgit stdenv autoconf automake libtool glibcCross;
inherit (gnu) machHeaders hurdHeaders; inherit (gnu) machHeaders hurdHeaders;
hurd = gnu.hurdCrossIntermediate; hurd = gnu.hurdCrossIntermediate;