commit adc8900df1758eda56abd68f7d781d1df74fa531 · pyrox.dev/nixpkgs

+6 -8

pkgs/build-support/bintools-wrapper/default.nix

···

       55
       55
        
         bintoolsVersion = lib.getVersion bintools;

     

       56
       56
        
         bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools);

     

       57
       57
        
       

     

       58
       58
       -
         libc_bin = if libc == null then null else getBin libc;

     

       59
       59
       -
         libc_dev = if libc == null then null else getDev libc;

     

       60
       60
       -
         libc_lib = if libc == null then null else getLib libc;

     

       58
       58
       +
         libc_bin = if libc == null then "" else getBin libc;

     

       59
       59
       +
         libc_dev = if libc == null then "" else getDev libc;

     

       60
       60
       +
         libc_lib = if libc == null then "" else getLib libc;

     

       61
       61
        
         bintools_bin = if nativeTools then "" else getBin bintools;

     

       62
       62
        
         # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.

     

       63
       63
        
         coreutils_bin = if nativeTools then "" else getBin coreutils;

     
···

       102
       102
        
         version = if bintools == null then null else bintoolsVersion;

     

       103
       103
        
       

     

       104
       104
        
         preferLocalBuild = true;

     

       105
       105
       -
       

     

       106
       106
       -
         inherit bintools_bin libc_bin libc_dev libc_lib;

     

       107
       105
        
       

     

       108
       106
        
         outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info");

     

       109
       107
        
       

     
···

       189
       187
        
       

     

       190
       188
        
         strictDeps = true;

     

       191
       189
        
         depsTargetTargetPropagated = extraPackages;

     

       192
       192
       -
       

     

       193
       193
       -
         wrapperName = "BINTOOLS_WRAPPER";

     

       194
       190
        
       

     

       195
       191
        
         setupHooks = [

     

       196
       192
        
           ../setup-hooks/role.bash

     
···

       368
       364
        
           expandResponseParams = "${expand-response-params}/bin/expand-response-params";

     

       369
       365
        
           shell = getBin shell + shell.shellPath or "";

     

       370
       366
        
           gnugrep_bin = if nativeTools then "" else gnugrep;

     

       371
       371
       -
           inherit dynamicLinker suffixSalt coreutils_bin;

     

       367
       367
       +
           wrapperName = "BINTOOLS_WRAPPER";

     

       368
       368
       +
           inherit dynamicLinker targetPrefix suffixSalt coreutils_bin;

     

       369
       369
       +
           inherit bintools_bin libc_bin libc_dev libc_lib;

     

       372
       370
        
         };

     

       373
       371
        
       

     

       374
       372
        
         meta =

+8 -11

pkgs/build-support/cc-wrapper/default.nix

···

       42
       42
        
         ccVersion = lib.getVersion cc;

     

       43
       43
        
         ccName = lib.removePrefix targetPrefix (lib.getName cc);

     

       44
       44
        
       

     

       45
       45
       -
         libc_bin = if libc == null then null else getBin libc;

     

       46
       46
       -
         libc_dev = if libc == null then null else getDev libc;

     

       47
       47
       -
         libc_lib = if libc == null then null else getLib libc;

     

       45
       45
       +
         libc_bin = if libc == null then "" else getBin libc;

     

       46
       46
       +
         libc_dev = if libc == null then "" else getDev libc;

     

       47
       47
       +
         libc_lib = if libc == null then "" else getLib libc;

     

       48
       48
        
         cc_solib = getLib cc

     

       49
       49
        
           + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

     

       50
       50
        
       

     
···

       131
       131
        
       

     

       132
       132
        
         preferLocalBuild = true;

     

       133
       133
        
       

     

       134
       134
       -
         inherit cc libc_bin libc_dev libc_lib;

     

       135
       135
       -
       

     

       136
       136
       -
         inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;

     

       137
       137
       -
       

     

       138
       134
        
         outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];

     

       139
       135
        
       

     

       140
       136
        
         passthru = {

     
···

       144
       140
        
           # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an

     

       145
       141
        
           # unused middle-ground name that evokes both.

     

       146
       142
        
           inherit bintools;

     

       147
       147
       -
           inherit libc nativeTools nativeLibc nativePrefix isGNU isClang;

     

       143
       143
       +
           inherit cc libc nativeTools nativeLibc nativePrefix isGNU isClang;

     

       148
       144
        
       

     

       149
       145
        
           emacsBufferSetup = pkgs: ''

     

       150
       146
        
             ; We should handle propagation here too

     
···

       267
       263
        
         strictDeps = true;

     

       268
       264
        
         propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ];

     

       269
       265
        
         depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;

     

       270
       270
       -
       

     

       271
       271
       -
         wrapperName = "CC_WRAPPER";

     

       272
       266
        
       

     

       273
       267
        
         setupHooks = [

     

       274
       268
        
           ../setup-hooks/role.bash

     
···

       541
       535
        
           expandResponseParams = "${expand-response-params}/bin/expand-response-params";

     

       542
       536
        
           shell = getBin shell + shell.shellPath or "";

     

       543
       537
        
           gnugrep_bin = if nativeTools then "" else gnugrep;

     

       544
       544
       -
           inherit suffixSalt coreutils_bin bintools;

     

       538
       538
       +
           wrapperName = "CC_WRAPPER";

     

       539
       539
       +
           inherit suffixSalt coreutils_bin bintools cc;

     

       540
       540
       +
           inherit libc_bin libc_dev libc_lib;

     

       541
       541
       +
           inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;

     

       545
       542
        
         };

     

       546
       543
        
       

     

       547
       544
        
         meta =

+6 -4

pkgs/build-support/nuke-references/default.nix

···

       32
       32
        
         '';

     

       33
       33
        
       

     

       34
       34
        
         # FIXME: get rid of perl dependency.

     

       35
       35
       -
         inherit perl;

     

       36
       36
       -
         inherit (builtins) storeDir;

     

       37
       37
       -
         shell = lib.getBin shell + (shell.shellPath or "");

     

       38
       38
       -
         signingUtils = if darwinCodeSign then signingUtils else null;

     

       35
       35
       +
         env = {

     

       36
       36
       +
           inherit perl;

     

       37
       37
       +
           inherit (builtins) storeDir;

     

       38
       38
       +
           shell = lib.getBin shell + (shell.shellPath or "");

     

       39
       39
       +
           signingUtils = if darwinCodeSign then signingUtils else "";

     

       40
       40
       +
         };

     

       39
       41
        
       }

+7 -6

pkgs/build-support/pkg-config-wrapper/default.nix

···

       36
       36
        
       

     

       37
       37
        
         preferLocalBuild = true;

     

       38
       38
        
       

     

       39
       39
       -
         shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or "";

     

       40
       40
       -
       

     

       41
       41
       -
         inherit targetPrefix suffixSalt baseBinName;

     

       42
       42
       -
       

     

       43
       39
        
         outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc");

     

       44
       40
        
       

     

       45
       41
        
         passthru = {

     

       42
       42
       +
           inherit targetPrefix suffixSalt;

     

       46
       43
        
           inherit pkg-config;

     

       47
       44
        
         };

     

       48
       45
        
       

     
···

       82
       79
        
           + ''

     

       83
       80
        
             ln -s ${pkg-config}/share $out/share

     

       84
       81
        
           '';

     

       85
       85
       -
       

     

       86
       86
       -
         wrapperName = "PKG_CONFIG_WRAPPER";

     

       87
       82
        
       

     

       88
       83
        
         setupHooks = [

     

       89
       84
        
           ../setup-hooks/role.bash

     
···

       119
       114
        
           ## Extra custom steps

     

       120
       115
        
           ##

     

       121
       116
        
           + extraBuildCommands;

     

       117
       117
       +
       

     

       118
       118
       +
         env = {

     

       119
       119
       +
           shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or "";

     

       120
       120
       +
           wrapperName = "PKG_CONFIG_WRAPPER";

     

       121
       121
       +
           inherit targetPrefix suffixSalt baseBinName;

     

       122
       122
       +
         };

     

       122
       123
        
       

     

       123
       124
        
         meta =

     

       124
       125
        
           let pkg-config_ = if pkg-config != null then pkg-config else {}; in

+1

pkgs/development/compilers/gcc/builder.sh

···

       1
       1
       +
       if [ -e .attrs.sh ]; then source .attrs.sh; fi

     

       1
       2
        
       source $stdenv/setup

     

       2
       3
        
       

     

       3
       4

+11 -9

pkgs/development/interpreters/python/cpython/default.nix

···

       281
       281
        
           substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"

     

       282
       282
        
         '';

     

       283
       283
        
       

     

       284
       284
       -
         CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);

     

       285
       285
       -
         LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);

     

       286
       286
       -
         LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}";

     

       287
       287
       -
         NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({

     

       288
       288
       -
           "glibc" = "-lgcc_s";

     

       289
       289
       -
           "musl" = "-lgcc_eh";

     

       290
       290
       -
         }."${stdenv.hostPlatform.libc}" or "");

     

       291
       291
       -
         # Determinism: We fix the hashes of str, bytes and datetime objects.

     

       292
       292
       -
         PYTHONHASHSEED=0;

     

       284
       284
       +
         env = {

     

       285
       285
       +
           CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);

     

       286
       286
       +
           LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);

     

       287
       287
       +
           LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"}";

     

       288
       288
       +
           NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) ({

     

       289
       289
       +
             "glibc" = "-lgcc_s";

     

       290
       290
       +
             "musl" = "-lgcc_eh";

     

       291
       291
       +
           }."${stdenv.hostPlatform.libc}" or "");

     

       292
       292
       +
           # Determinism: We fix the hashes of str, bytes and datetime objects.

     

       293
       293
       +
           PYTHONHASHSEED=0;

     

       294
       294
       +
         };

     

       293
       295
        
       

     

       294
       296
        
         configureFlags = [

     

       295
       297
        
           "--without-ensurepip"

+3 -1

pkgs/development/interpreters/python/setup-hook.nix

···

       6
       6
        
         hook = ./setup-hook.sh;

     

       7
       7
        
       in runCommand "python-setup-hook.sh" {

     

       8
       8
        
         strictDeps = true;

     

       9
       9
       -
         inherit sitePackages;

     

       9
       9
       +
         env = {

     

       10
       10
       +
           inherit sitePackages;

     

       11
       11
       +
         };

     

       10
       12
        
       } ''

     

       11
       13
        
         cp ${hook} hook.sh

     

       12
       14
        
         substituteAllInPlace hook.sh

+3 -1

pkgs/development/libraries/gettext/default.nix

···

       60
       60
        
           ../../../build-support/setup-hooks/role.bash

     

       61
       61
        
           ./gettext-setup-hook.sh

     

       62
       62
        
         ];

     

       63
       63
       -
         gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl;

     

       63
       63
       +
         env = {

     

       64
       64
       +
           gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl;

     

       65
       65
       +
         };

     

       64
       66
        
       

     

       65
       67
        
         enableParallelBuilding = true;

     

       66
       68
        
         enableParallelChecking = false; # fails sometimes

+8 -7

pkgs/development/libraries/glibc/common.nix

···

       54
       54
        
       

     

       55
       55
        
       stdenv.mkDerivation ({

     

       56
       56
        
         version = version + patchSuffix;

     

       57
       57
       -
         linuxHeaders = if withLinuxHeaders then linuxHeaders else null;

     

       58
       58
       -
       

     

       59
       59
       -
         inherit (stdenv) is64bit;

     

       60
       57
        
       

     

       61
       58
        
         enableParallelBuilding = true;

     

       62
       59
        
       

     
···

       175
       172
        
         nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs;

     

       176
       173
        
         buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs;

     

       177
       174
        
       

     

       178
       178
       -
         # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to

     

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

     

       180
       180
       -
         # bootstrap.

     

       181
       181
       -
         BASH_SHELL = "/bin/sh";

     

       175
       175
       +
         env = {

     

       176
       176
       +
           linuxHeaders = if withLinuxHeaders then linuxHeaders else "";

     

       177
       177
       +
           inherit (stdenv) is64bit;

     

       178
       178
       +
           # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to

     

       179
       179
       +
           # prevent a retained dependency on the bootstrap tools in the stdenv-linux

     

       180
       180
       +
           # bootstrap.

     

       181
       181
       +
           BASH_SHELL = "/bin/sh";

     

       182
       182
       +
         };

     

       182
       183
        
       

     

       183
       184
        
         # Used by libgcc, elf-header, and others to determine ABI

     

       184
       185
        
         passthru = { inherit version; minorRelease = version; };

+3

pkgs/development/perl-modules/generic/builder.sh

···

       1
       1
       +
       if [ -f .attrs.sh ]; then

     

       2
       2
       +
           . .attrs.sh

     

       3
       3
       +
       fi

     

       1
       4
        
       source $stdenv/setup

     

       2
       5
        
       

     

       3
       6
        
       PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"

+6 -3

pkgs/development/perl-modules/generic/default.nix

···

       24
       24
        
       # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC

     

       25
       25
        
       , PERL_USE_UNSAFE_INC ? "1"

     

       26
       26
        
       

     

       27
       27
       +
       , env ? {}

     

       28
       28
       +
       

     

       27
       29
        
       , ...

     

       28
       30
        
       }@attrs:

     

       29
       31
        
       

     
···

       43
       45
        
           buildInputs = buildInputs ++ [ perl ];

     

       44
       46
        
           nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ];

     

       45
       47
        
       

     

       46
       46
       -
           fullperl = buildPerl;

     

       47
       47
       -
       

     

       48
       48
        
           inherit outputs src doCheck checkTarget enableParallelBuilding;

     

       49
       49
       -
           inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC;

     

       49
       49
       +
           env = {

     

       50
       50
       +
             inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC;

     

       51
       51
       +
             fullperl = buildPerl;

     

       52
       52
       +
           } // env;

     

       50
       53
        
       

     

       51
       54
        
           meta = defaultMeta // (attrs.meta or { });

     

       52
       55
        
         });