commit 7e096024d7cf0ea1ca2a0d0d79d33d3f3e4e9965 · pyrox.dev/nixpkgs

+9 -8

pkgs/development/libraries/glibc/common.nix

···

       4
       4
        
       cross:

     

       5
       5
        
       

     

       6
       6
        
       { name, fetchurl, lib, stdenv, installLocales ? false

     

       7
       7
       -
       , gccCross ? null, linuxHeaders ? null

     

       7
       7
       +
       , linuxHeaders ? null

     

       8
       8
        
       , profilingLibraries ? false, meta

     

       9
       9
        
       , withGd ? false, gd ? null, libpng ? null

     

       10
       10
       -
       , preConfigure ? "", ... }@args:

     

       10
       10
       +
       , preConfigure ? ""

     

       11
       11
       +
       , buildPackages ? {}

     

       12
       12
       +
       , ...

     

       13
       13
       +
       } @ args:

     

       11
       14
        
       

     

       12
       15
        
       let

     

       13
       16
        
         version = "2.25";

     

       14
       17
        
         sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";

     

       15
       18
        
       in

     

       16
       19
        
       

     

       17
       17
       -
       assert cross != null -> gccCross != null;

     

       20
       20
       +
       assert cross != null -> buildPackages.stdenv ? cc;

     

       18
       21
        
       

     

       19
       22
        
       stdenv.mkDerivation ({

     

       20
       23
        
         inherit linuxHeaders installLocales;

     
···

       113
       116
        
       

     

       114
       117
        
         outputs = [ "out" "bin" "dev" "static" ];

     

       115
       118
        
       

     

       116
       116
       -
         buildInputs = lib.optionals (cross != null) [ gccCross ]

     

       117
       117
       -
           ++ lib.optionals withGd [ gd libpng ];

     

       119
       119
       +
         nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc;

     

       120
       120
       +
         buildInputs = lib.optionals withGd [ gd libpng ];

     

       118
       121
        
       

     

       119
       122
        
         # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to

     

       120
       123
        
         # prevent a retained dependency on the bootstrap tools in the stdenv-linux

     
···

       122
       125
        
         BASH_SHELL = "/bin/sh";

     

       123
       126
        
       }

     

       124
       127
        
       

     

       125
       125
       -
       # Remove the `gccCross' attribute so that the *native* glibc store path

     

       126
       126
       -
       # doesn't depend on whether `gccCross' is null or not.

     

       127
       127
       -
       // (removeAttrs args [ "lib" "gccCross" "fetchurl" "withGd" "gd" "libpng" ]) //

     

       128
       128
       +
       // (removeAttrs args [ "lib" "buildPackages" "fetchurl" "withGd" "gd" "libpng" ]) //

     

       128
       129
        
       

     

       129
       130
        
       {

     

       130
       131
        
         name = name + "-${version}" +

+7 -5

pkgs/development/libraries/glibc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, linuxHeaders

     

       1
       1
       +
       { lib, stdenv, fetchurl

     

       2
       2
        
       , installLocales ? true

     

       3
       3
        
       , profilingLibraries ? false

     

       4
       4
       -
       , gccCross ? null

     

       5
       4
        
       , withGd ? false, gd ? null, libpng ? null

     

       5
       5
       +
       , buildPlatform, hostPlatform

     

       6
       6
       +
       , buildPackages

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       assert stdenv.cc.isGNU;

     

       9
       10
        
       

     

       10
       11
        
       let

     

       11
       12
        
         build = import ./common.nix;

     

       12
       12
       -
         cross = if gccCross != null then gccCross.target else null;

     

       13
       13
       +
         cross = if buildPlatform != hostPlatform then hostPlatform else null;

     

       14
       14
       +
         inherit (buildPackages) linuxHeaders;

     

       13
       15
        
       in

     

       14
       16
        
         build cross ({

     

       15
       17
        
           name = "glibc" + lib.optionalString withGd "-gd";

     

       16
       18
        
       

     

       17
       17
       -
           inherit lib stdenv fetchurl linuxHeaders installLocales

     

       18
       18
       -
             profilingLibraries gccCross withGd gd libpng;

     

       19
       19
       +
           inherit lib stdenv buildPackages fetchurl linuxHeaders installLocales

     

       20
       20
       +
             profilingLibraries withGd gd libpng;

     

       19
       21
        
       

     

       20
       22
        
           NIX_NO_SELF_RPATH = true;

     

       21
       23

+1 -1

pkgs/stdenv/linux/make-bootstrap-tools-cross.nix

···

       92
       92
        
       

     

       93
       93
        
         pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);

     

       94
       94
        
       

     

       95
       95
       -
         glibc = pkgs.buildPackages.libcCross;

     

       95
       95
       +
         glibc = pkgs.libcCross;

     

       96
       96
        
         bash = pkgs.bash;

     

       97
       97
        
         findutils = pkgs.findutils;

     

       98
       98
        
         diffutils = pkgs.diffutils;

+14 -5

pkgs/top-level/all-packages.nix

···

       7700
       7700
        
       

     

       7701
       7701
        
         glibc = callPackage ../development/libraries/glibc {

     

       7702
       7702
        
           installLocales = config.glibc.locales or false;

     

       7703
       7703
       -
           gccCross = null;

     

       7704
       7703
        
         };

     

       7705
       7704
        
       

     

       7706
       7705
        
         glibc_memusage = callPackage ../development/libraries/glibc {

     
···

       7708
       7707
        
           withGd = true;

     

       7709
       7708
        
         };

     

       7710
       7709
        
       

     

       7711
       7711
       -
         glibcCross = forcedNativePackages.glibc.override {

     

       7712
       7712
       -
           gccCross = gccCrossStageStatic;

     

       7713
       7713
       -
           inherit (forcedNativePackages) linuxHeaders;

     

       7710
       7710
       +
         # Being redundant to avoid cycles on boot. TODO: find a better way

     

       7711
       7711
       +
         glibcCross = callPackage ../development/libraries/glibc {

     

       7712
       7712
       +
           installLocales = config.glibc.locales or false;

     

       7713
       7713
       +
           # Can't just overrideCC, because then the stdenv-cross mkDerivation will be

     

       7714
       7714
       +
           # thrown away. TODO: find a better solution for this.

     

       7715
       7715
       +
           stdenv = buildPackages.makeStdenvCross

     

       7716
       7716
       +
             buildPackages.buildPackages.stdenv

     

       7717
       7717
       +
             buildPackages.targetPlatform

     

       7718
       7718
       +
             buildPackages.binutils

     

       7719
       7719
       +
             buildPackages.gccCrossStageStatic;

     

       7714
       7720
        
         };

     

       7715
       7721
        
       

     

       7716
       7722
        
         # We can choose:

     

       7717
       7717
       -
         libcCrossChooser = name: if name == "glibc" then glibcCross

     

       7723
       7723
       +
         libcCrossChooser = name:

     

       7724
       7724
       +
           # libc is hackily often used from the previous stage. This `or`

     

       7725
       7725
       +
           # hack fixes the hack, *sigh*.

     

       7726
       7726
       +
           /**/ if name == "glibc" then __targetPackages.glibcCross or glibcCross

     

       7718
       7727
        
           else if name == "uclibc" then uclibcCross

     

       7719
       7728
        
           else if name == "msvcrt" then windows.mingw_w64

     

       7720
       7729
        
           else if name == "libSystem" then darwin.xcode