diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-09-20 01:25:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 01:25:02 -0400 |
| commit | 19e3c580ad60319596cab44e1ed75640b69c09d4 (patch) | |
| tree | 8a6ad702b34c982ceee4bd366f297b65b94877db /pkgs/os-specific | |
| parent | c1de354a3db238ddd1c125a77fd931566b2dda47 (diff) | |
| parent | 1fc12241edb27fc9bb40b2c191f2718493a7f895 (diff) | |
| download | nixpkgs-19e3c580ad60319596cab44e1ed75640b69c09d4.tar nixpkgs-19e3c580ad60319596cab44e1ed75640b69c09d4.tar.gz nixpkgs-19e3c580ad60319596cab44e1ed75640b69c09d4.tar.bz2 nixpkgs-19e3c580ad60319596cab44e1ed75640b69c09d4.tar.lz nixpkgs-19e3c580ad60319596cab44e1ed75640b69c09d4.tar.xz nixpkgs-19e3c580ad60319596cab44e1ed75640b69c09d4.tar.zst nixpkgs-19e3c580ad60319596cab44e1ed75640b69c09d4.zip | |
Merge pull request #29584 from obsidiansystems/no-wrapCCCross
top-level: Remove useless abstractions
Diffstat (limited to 'pkgs/os-specific')
| -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 247c73e468d..fb3796394e8 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 |