Author: ludo
Date: Fri Apr 6 13:18:58 2012
New Revision: 33649
URL: https://nixos.org/websvn/nix/?rev=33649&sc=1
Log:
GNU: Use `callPackage'.
Modified:
nixpkgs/trunk/pkgs/os-specific/gnu/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/gnu/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/gnu/default.nix Fri Apr 6 13:10:19
2012 (r33648)
+++ nixpkgs/trunk/pkgs/os-specific/gnu/default.nix Fri Apr 6 13:18:58
2012 (r33649)
@@ -12,7 +12,7 @@
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 @@
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 @@
hurd = null;
};
- libpthreadCross = forceBuildDrv(import ./libpthread {
+ libpthreadCross = forceBuildDrv(callPackage ./libpthread {
inherit fetchgit stdenv autoconf automake libtool glibcCross;
inherit (gnu) machHeaders hurdHeaders;
hurd = gnu.hurdCrossIntermediate;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
