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

GNU: Avoid `__overrides' altogether, by using a non-recursive attrset.

Browse Source 
Thanks to Eelco for the suggestion.

svn path=/nixpkgs/trunk/; revision=33587
This commit is contained in:
Ludovic Courtès 2012-04-04 20:25:51 +00:00
parent 1663ca3344
commit 3226d8b91d
2 changed files with 93 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,18 +3,19 @@
args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
, gccCrossStageStatic, gccCrossStageFinal
, forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem
, forceBuildDrv, forceSystem, newScope, platform, config, crossSystem
, overrides ? {} }:
with args;
rec {
# Allow callers to override elements of this attribute set.
__overrides = overrides;
let
callPackage = newScope gnu;
gnu = {
hurdCross = forceBuildDrv(import ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo machHeaders
mig glibcCross hurdPartedCross;
inherit fetchgit stdenv autoconf libtool texinfo
glibcCross hurdPartedCross;
inherit (gnu) machHeaders mig;
libuuid = libuuid.hostDrv;
automake = automake111x;
headersOnly = false;
@ -23,8 +24,8 @@ rec {
});
hurdCrossIntermediate = forceBuildDrv(import ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo machHeaders
mig glibcCross;
inherit fetchgit stdenv autoconf libtool texinfo glibcCross;
inherit (gnu) machHeaders mig;
automake = automake111x;
headersOnly = false;
cross = assert crossSystem != null; crossSystem;
@ -56,9 +57,9 @@ rec {
};
libpthreadCross = forceBuildDrv(import ./libpthread {
inherit fetchgit stdenv autoconf automake libtool
machHeaders hurdHeaders glibcCross;
hurd = hurdCrossIntermediate;
inherit fetchgit stdenv autoconf automake libtool glibcCross;
inherit (gnu) machHeaders hurdHeaders;
hurd = gnu.hurdCrossIntermediate;
gccCross = gccCrossStageStatic;
cross = assert crossSystem != null; crossSystem;
});
@ -95,4 +96,9 @@ rec {
unionfs = callPackage ./unionfs {
hurd = hurdCross;
};
}
}
# Allow callers to override elements of this attribute set.
// overrides;
in gnu # we trust!

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

@ -5447,7 +5447,6 @@ let
# GNU/Hurd core packages.
gnu = recurseIntoAttrs (callPackage ../os-specific/gnu {
callPackage = newScope pkgs.gnu;
inherit platform crossSystem;
});