diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-04-06 13:18:58 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-04-06 13:18:58 +0000 |
commit | e24eab9b8723280eaa460109914a70d30370e107 (patch) | |
tree | 7e82156fa7055082c9edb97fc5ab83314009dd08 /pkgs/os-specific/gnu/default.nix | |
parent | 9f2068ac9bc5931ea9e04f8c4cec7fb52b1628c7 (diff) | |
download | nixpkgs-e24eab9b8723280eaa460109914a70d30370e107.tar nixpkgs-e24eab9b8723280eaa460109914a70d30370e107.tar.gz nixpkgs-e24eab9b8723280eaa460109914a70d30370e107.tar.bz2 nixpkgs-e24eab9b8723280eaa460109914a70d30370e107.tar.lz nixpkgs-e24eab9b8723280eaa460109914a70d30370e107.tar.xz nixpkgs-e24eab9b8723280eaa460109914a70d30370e107.tar.zst nixpkgs-e24eab9b8723280eaa460109914a70d30370e107.zip |
GNU: Use `callPackage'.
svn path=/nixpkgs/trunk/; revision=33649
Diffstat (limited to 'pkgs/os-specific/gnu/default.nix')
-rw-r--r-- | pkgs/os-specific/gnu/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 67226c8a478..0a42b83a46f 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -12,7 +12,7 @@ let callPackage = newScope gnu; gnu = { - hurdCross = forceBuildDrv(import ./hurd { + hurdCross = forceBuildDrv(callPackage ./hurd { inherit fetchgit stdenv autoconf libtool texinfo glibcCross hurdPartedCross; inherit (gnu) machHeaders mig; @@ -23,9 +23,11 @@ let gccCross = gccCrossStageFinal; }); - hurdCrossIntermediate = forceBuildDrv(import ./hurd { + hurdCrossIntermediate = forceBuildDrv(callPackage ./hurd { inherit fetchgit stdenv autoconf libtool texinfo glibcCross; inherit (gnu) machHeaders mig; + hurdPartedCross = null; + libuuid = null; automake = automake111x; headersOnly = false; cross = assert crossSystem != null; crossSystem; @@ -56,7 +58,7 @@ let hurd = null; }; - libpthreadCross = forceBuildDrv(import ./libpthread { + libpthreadCross = forceBuildDrv(callPackage ./libpthread { inherit fetchgit stdenv autoconf automake libtool glibcCross; inherit (gnu) machHeaders hurdHeaders; hurd = gnu.hurdCrossIntermediate; |