all-packages: Remove forcedNativePackages; we no longer need it

Its kept around in the Hurd package set, but all that code is presumably broken.
2017-09-20 00:59:19 -04:00
parent 100db4fa3b
commit e19bb868dc
2 changed files with 13 additions and 15 deletions
@@ -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