ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 20:20:26 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Its kept around in the Hurd package set, but all that code is
presumably broken.
This commit is contained in:
John Ericson 2017-09-19 20:24:43 -04:00
parent 100db4fa3b
commit e19bb868dc
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,15 +3,22 @@
args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
, texinfo, glibcCross, hurdPartedCross, libuuid, samba , texinfo, glibcCross, hurdPartedCross, libuuid, samba
, gccCrossStageStatic, gccCrossStageFinal , gccCrossStageStatic, gccCrossStageFinal
, forcedNativePackages, forceSystem, newScope, platform, config , forceSystem, newScope, platform, config
, targetPlatform, buildPlatform , targetPlatform, buildPlatform
, overrides ? {} }: , overrides ? {}
, buildPackages, pkgs
}:
with args; with args;
let let
callPackage = newScope gnu; callPackage = newScope gnu;
forcedNativePackages =
if stdenv.hostPlatform == stdenv.buildPlatform
then pkgs
else buildPackages;
gnu = { gnu = {
hurdCross = forcedNativePackages.callPackage ./hurd { hurdCross = forcedNativePackages.callPackage ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo inherit fetchgit stdenv autoconf libtool texinfo

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

@ -29,8 +29,6 @@ with pkgs;
callPackage_i686 = pkgsi686Linux.callPackage; callPackage_i686 = pkgsi686Linux.callPackage;
forcedNativePackages = if hostPlatform == buildPlatform then pkgs else buildPackages;
# A stdenv capable of building 32-bit binaries. On x86_64-linux, # A stdenv capable of building 32-bit binaries. On x86_64-linux,
# it uses GCC compiled with multilib support; on i686-linux, it's # it uses GCC compiled with multilib support; on i686-linux, it's
# just the plain stdenv. # just the plain stdenv.
@ -5428,34 +5426,27 @@ with pkgs;
else if targetPlatform.libc == "libSystem" then darwin.xcode else if targetPlatform.libc == "libSystem" then darwin.xcode
else null; else null;
in wrapCCCross { in wrapCCCross {
cc = forcedNativePackages.gcc.cc.override { cc = gcc.cc.override {
crossStageStatic = true; crossStageStatic = true;
langCC = false; langCC = false;
libcCross = libcCross1; libcCross = libcCross1;
enableShared = false; enableShared = false;
# Why is this needed? # Why is this needed?
inherit (forcedNativePackages) binutils;
}; };
libc = libcCross1; libc = libcCross1;
inherit (forcedNativePackages) binutils;
}; };
# Only needed for mingw builds # Only needed for mingw builds
gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCCross { gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCCross {
cc = gccCrossStageStatic.gcc; cc = gccCrossStageStatic.gcc;
libc = windows.mingw_headers2; libc = windows.mingw_headers2;
inherit (forcedNativePackages) binutils;
}; };
gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCCross { gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCCross {
cc = forcedNativePackages.gcc.cc.override { cc = gcc.cc.override {
crossStageStatic = false; crossStageStatic = false;
# Why is this needed?
inherit (forcedNativePackages) binutils;
}; };
libc = libcCross; libc = libcCross;
inherit (forcedNativePackages) binutils;
}; };
gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {
@ -6232,7 +6223,7 @@ with pkgs;
wrapCCCross = wrapCCCross =
{cc, libc, binutils, name ? "gcc-cross-wrapper"}: {cc, libc, binutils, name ? "gcc-cross-wrapper"}:
forcedNativePackages.ccWrapperFun { ccWrapperFun {
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
noLibc = (libc == null); noLibc = (libc == null);
@ -7334,7 +7325,7 @@ with pkgs;
cross_renaming: we should make all programs use pkgconfig as cross_renaming: we should make all programs use pkgconfig as
nativeBuildInput after the renaming. nativeBuildInput after the renaming.
*/ */
pkgconfig = forcedNativePackages.callPackage ../development/tools/misc/pkgconfig { pkgconfig = callPackage ../development/tools/misc/pkgconfig {
fetchurl = fetchurlBoot; fetchurl = fetchurlBoot;
}; };
pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });