diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-19 20:24:43 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 00:59:19 -0400 |
| commit | e19bb868dc55265cf99bb00ab542f96110b9cf6e (patch) | |
| tree | 1c0ff813b7a4ffb38cb02ba8a9f77fa84ae634b8 /pkgs/os-specific/gnu/default.nix | |
| parent | 100db4fa3b3ba5906350fb1d5f157e0a3a3b2ef1 (diff) | |
| download | nixlib-e19bb868dc55265cf99bb00ab542f96110b9cf6e.tar nixlib-e19bb868dc55265cf99bb00ab542f96110b9cf6e.tar.gz nixlib-e19bb868dc55265cf99bb00ab542f96110b9cf6e.tar.bz2 nixlib-e19bb868dc55265cf99bb00ab542f96110b9cf6e.tar.lz nixlib-e19bb868dc55265cf99bb00ab542f96110b9cf6e.tar.xz nixlib-e19bb868dc55265cf99bb00ab542f96110b9cf6e.tar.zst nixlib-e19bb868dc55265cf99bb00ab542f96110b9cf6e.zip | |
all-packages: Remove `forcedNativePackages`; we no longer need it
Its kept around in the Hurd package set, but all that code is presumably broken.
Diffstat (limited to 'pkgs/os-specific/gnu/default.nix')
| -rw-r--r-- | pkgs/os-specific/gnu/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 247c73e468d0..fb3796394e81 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -3,15 +3,22 @@ args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool , texinfo, glibcCross, hurdPartedCross, libuuid, samba , gccCrossStageStatic, gccCrossStageFinal -, forcedNativePackages, forceSystem, newScope, platform, config +, forceSystem, newScope, platform, config , targetPlatform, buildPlatform -, overrides ? {} }: +, overrides ? {} +, buildPackages, pkgs +}: with args; let callPackage = newScope gnu; + forcedNativePackages = + if stdenv.hostPlatform == stdenv.buildPlatform + then pkgs + else buildPackages; + gnu = { hurdCross = forcedNativePackages.callPackage ./hurd { inherit fetchgit stdenv autoconf libtool texinfo |