commit aa8868c7cca8d30706a68a876d048968c83e1cf1 · pyrox.dev/nixpkgs

+8 -7

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

···

       6
       6
        
       # compiler and the linker just "work".

     

       7
       7
        
       

     

       8
       8
        
       { name ? ""

     

       9
       9
       +
       , lib

     

       9
       10
        
       , stdenvNoCC

     

       10
       11
        
       , bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null

     

       11
       12
        
       , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""

     
···

       15
       16
        
       , useMacosReexportHack ? false

     

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       18
       -
       with stdenvNoCC.lib;

     

       19
       19
       +
       with lib;

     

       19
       20
        
       

     

       20
       21
        
       assert nativeTools -> !propagateDoc && nativePrefix != "";

     

       21
       22
        
       assert !nativeTools ->

     
···

       31
       32
        
         #

     

       32
       33
        
         # TODO(@Ericson2314) Make unconditional, or optional but always true by

     

       33
       34
        
         # default.

     

       34
       34
       -
         targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)

     

       35
       35
       +
         targetPrefix = lib.optionalString (targetPlatform != hostPlatform)

     

       35
       36
        
                                               (targetPlatform.config + "-");

     

       36
       37
        
       

     

       37
       37
       -
         bintoolsVersion = stdenv.lib.getVersion bintools;

     

       38
       38
       -
         bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools);

     

       38
       38
       +
         bintoolsVersion = lib.getVersion bintools;

     

       39
       39
       +
         bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools);

     

       39
       40
        
       

     

       40
       41
        
         libc_bin = if libc == null then null else getBin libc;

     

       41
       42
        
         libc_dev = if libc == null then null else getDev libc;

     
···

       62
       63
        
           else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"

     

       63
       64
        
           else if targetPlatform.isMips                     then "${libc_lib}/lib/ld.so.1"

     

       64
       65
        
           else if targetPlatform.isDarwin                   then "/usr/lib/dyld"

     

       65
       65
       -
           else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"

     

       66
       66
       +
           else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"

     

       66
       67
        
           else null;

     

       67
       68
        
       

     

       68
       69
        
         expand-response-params =

     
···

       326
       327
        
           let bintools_ = if bintools != null then bintools else {}; in

     

       327
       328
        
           (if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) //

     

       328
       329
        
           { description =

     

       329
       329
       -
               stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_

     

       330
       330
       +
               lib.attrByPath ["meta" "description"] "System binary utilities" bintools_

     

       330
       331
        
               + " (wrapper script)";

     

       331
       332
        
             priority = 10;

     

       332
       333
        
         } // optionalAttrs useMacosReexportHack {

     

       333
       333
       -
           platforms = stdenv.lib.platforms.darwin;

     

       334
       334
       +
           platforms = lib.platforms.darwin;

     

       334
       335
        
         };

     

       335
       336
        
       }

+9 -8

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

···

       6
       6
        
       # compiler and the linker just "work".

     

       7
       7
        
       

     

       8
       8
        
       { name ? ""

     

       9
       9
       +
       , lib

     

       9
       10
        
       , stdenvNoCC

     

       10
       11
        
       , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell

     

       11
       12
        
       , gccForLibs ? null

     
···

       18
       19
        
       , libcxx ? null

     

       19
       20
        
       }:

     

       20
       21
        
       

     

       21
       21
       -
       with stdenvNoCC.lib;

     

       22
       22
       +
       with lib;

     

       22
       23
        
       

     

       23
       24
        
       assert nativeTools -> !propagateDoc && nativePrefix != "";

     

       24
       25
        
       assert !nativeTools ->

     
···

       34
       35
        
         #

     

       35
       36
        
         # TODO(@Ericson2314) Make unconditional, or optional but always true by

     

       36
       37
        
         # default.

     

       37
       37
       -
         targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)

     

       38
       38
       +
         targetPrefix = lib.optionalString (targetPlatform != hostPlatform)

     

       38
       39
        
                                                  (targetPlatform.config + "-");

     

       39
       40
        
       

     

       40
       40
       -
         ccVersion = stdenv.lib.getVersion cc;

     

       41
       41
       -
         ccName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName cc);

     

       41
       41
       +
         ccVersion = lib.getVersion cc;

     

       42
       42
       +
         ccName = lib.removePrefix targetPrefix (lib.getName cc);

     

       42
       43
        
       

     

       43
       44
        
         libc_bin = if libc == null then null else getBin libc;

     

       44
       45
        
         libc_dev = if libc == null then null else getDev libc;

     
···

       247
       248
        
       

     

       248
       249
        
         setupHooks = [

     

       249
       250
        
           ../setup-hooks/role.bash

     

       250
       250
       -
         ] ++ stdenv.lib.optional (cc.langC or true) ./setup-hook.sh

     

       251
       251
       -
           ++ stdenv.lib.optional (cc.langFortran or false) ./fortran-hook.sh;

     

       251
       251
       +
         ] ++ lib.optional (cc.langC or true) ./setup-hook.sh

     

       252
       252
       +
           ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh;

     

       252
       253
        
       

     

       253
       254
        
         postFixup =

     

       254
       255
        
           # Ensure flags files exists, as some other programs cat them. (That these

     
···

       353
       354
        
           + optionalString (libcxx.isLLVM or false) (''

     

       354
       355
        
             echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags

     

       355
       356
        
             echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags

     

       356
       356
       -
           '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''

     

       357
       357
       +
           '' + lib.optionalString stdenv.targetPlatform.isLinux ''

     

       357
       358
        
             echo "-lc++abi" >> $out/nix-support/libcxx-ldflags

     

       358
       359
        
           '')

     

       359
       360
        
       

     
···

       492
       493
        
           let cc_ = if cc != null then cc else {}; in

     

       493
       494
        
           (if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) //

     

       494
       495
        
           { description =

     

       495
       495
       -
               stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_

     

       496
       496
       +
               lib.attrByPath ["meta" "description"] "System C compiler" cc_

     

       496
       497
        
               + " (wrapper script)";

     

       497
       498
        
             priority = 10;

     

       498
       499
        
         };

+1 -1

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

···

       10
       10
        
       , extraPackages ? [], extraBuildCommands ? ""

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
       -
       with stdenvNoCC.lib;

     

       13
       13
       +
       with lib;

     

       14
       14
        
       

     

       15
       15
        
       let

     

       16
       16
        
         stdenv = stdenvNoCC;

+8 -8

pkgs/build-support/release/ant-build.nix

···

       1
       1
        
       { src

     

       2
       2
        
       , pkgs

     

       3
       3
       +
       , lib

     

       3
       4
        
       , stdenv ? pkgs.stdenv

     

       4
       5
        
       , name

     

       5
       6
        
       , antTargets ? []

     
···

       16
       17
        
       , ... } @ args:

     

       17
       18
        
       

     

       18
       19
        
       let

     

       19
       19
       -
         antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;

     

       20
       20
       -
         lib = stdenv.lib;

     

       20
       20
       +
         antFlags = "-f ${buildfile} " + lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ;

     

       21
       21
        
       in

     

       22
       22
        
       stdenv.mkDerivation (

     

       23
       23
        
       

     
···

       31
       31
        
           prePhases =

     

       32
       32
        
             ["antSetupPhase"];

     

       33
       33
        
       

     

       34
       34
       -
           antSetupPhase = with stdenv.lib; ''

     

       34
       34
       +
           antSetupPhase = with lib; ''

     

       35
       35
        
             if test "$hydraAntLogger" != "" ; then

     

       36
       36
        
               export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`"

     

       37
       37
        
             fi

     
···

       46
       46
        
             mkdir -p $out/share/java

     

       47
       47
        
             ${ if jars == [] then ''

     

       48
       48
        
                  find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java

     

       49
       49
       -
                '' else stdenv.lib.concatMapStrings (j: ''

     

       49
       49
       +
                '' else lib.concatMapStrings (j: ''

     

       50
       50
        
                  cp -v ${j} $out/share/java

     

       51
       51
        
                '') jars }

     

       52
       52
        
       

     
···

       65
       65
        
             in

     

       66
       66
        
             ''

     

       67
       67
        
             header "Generating jar wrappers"

     

       68
       68
       -
           '' + (stdenv.lib.concatMapStrings (w: ''

     

       68
       68
       +
           '' + (lib.concatMapStrings (w: ''

     

       69
       69
        
       

     

       70
       70
        
             mkdir -p $out/bin

     

       71
       71
        
             cat >> $out/bin/${w.name} <<EOF

     
···

       85
       85
        
             header "Building default ant target"

     

       86
       86
        
             ant ${antFlags}

     

       87
       87
        
             closeNest

     

       88
       88
       -
           '' else stdenv.lib.concatMapStrings (t: ''

     

       88
       88
       +
           '' else lib.concatMapStrings (t: ''

     

       89
       89
        
             header "Building '${t}' target"

     

       90
       90
        
             ant ${antFlags} ${t}

     

       91
       91
        
             closeNest

     
···

       103
       103
        
             '';

     

       104
       104
        
         }

     

       105
       105
        
       

     

       106
       106
       -
         // removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] //

     

       106
       106
       +
         // removeAttrs args ["antProperties" "buildInputs" "pkgs" "lib" "jarWrappers"] //

     

       107
       107
        
       

     

       108
       108
        
         {

     

       109
       109
        
           name = name + (if src ? version then "-" + src.version else "");

     

       110
       110
        
       

     

       111
       111
       -
           buildInputs = [ant jre zip unzip] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ;

     

       111
       111
       +
           buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ;

     

       112
       112
        
       

     

       113
       113
        
           postHook = ''

     

       114
       114
        
             mkdir -p $out/nix-support

+1 -1

pkgs/build-support/release/debian-build.nix

···

       4
       4
        
       { name ? "debian-build"

     

       5
       5
        
       , lib

     

       6
       6
        
       , diskImage

     

       7
       7
       -
       , src, stdenv, vmTools, checkinstall

     

       7
       7
       +
       , src, lib, stdenv, vmTools, checkinstall

     

       8
       8
        
       , fsTranslation ? false

     

       9
       9
        
       , # Features provided by this package.

     

       10
       10
        
         debProvides ? []

+1 -1

pkgs/build-support/release/default.nix

···

       15
       15
        
           } // args);

     

       16
       16
        
       

     

       17
       17
        
         antBuild = args: import ./ant-build.nix (

     

       18
       18
       -
           { inherit pkgs;

     

       18
       18
       +
           { inherit lib pkgs;

     

       19
       19
        
           } // args);

     

       20
       20
        
       

     

       21
       21
        
         mvnBuild = args: import ./maven-build.nix (

+2 -1

pkgs/stdenv/darwin/default.nix

···

       80
       80
        
       

     

       81
       81
        
             mkCC = overrides: import ../../build-support/cc-wrapper (

     

       82
       82
        
               let args = {

     

       83
       83
       -
                 inherit shell;

     

       83
       83
       +
                 inherit lib shell;

     

       84
       84
        
                 inherit (last) stdenvNoCC;

     

       85
       85
        
       

     

       86
       86
        
                 nativeTools  = false;

     
···

       217
       217
        
       

     

       218
       218
        
               binutils = lib.makeOverridable (import ../../build-support/bintools-wrapper) {

     

       219
       219
        
                 shell = "${bootstrapTools}/bin/bash";

     

       220
       220
       +
                 inherit lib;

     

       220
       221
        
                 inherit (self) stdenvNoCC;

     

       221
       222
        
       

     

       222
       223
        
                 nativeTools  = false;

+3

pkgs/stdenv/linux/default.nix

···

       107
       107
        
                 bintools = prevStage.binutils;

     

       108
       108
        
                 isGNU = true;

     

       109
       109
        
                 libc = getLibc prevStage;

     

       110
       110
       +
                 inherit lib;

     

       110
       111
        
                 inherit (prevStage) coreutils gnugrep;

     

       111
       112
        
                 stdenvNoCC = prevStage.ccWrapperStdenv;

     

       112
       113
        
               };

     
···

       166
       167
        
               nativeLibc = false;

     

       167
       168
        
               buildPackages = { };

     

       168
       169
        
               libc = getLibc self;

     

       170
       170
       +
               inherit lib;

     

       169
       171
        
               inherit (self) stdenvNoCC coreutils gnugrep;

     

       170
       172
        
               bintools = bootstrapTools;

     

       171
       173
        
             };

     
···

       312
       314
        
               cc = prevStage.gcc-unwrapped;

     

       313
       315
        
               bintools = self.binutils;

     

       314
       316
        
               libc = getLibc self;

     

       317
       317
       +
               inherit lib;

     

       315
       318
        
               inherit (self) stdenvNoCC coreutils gnugrep;

     

       316
       319
        
               shell = self.bash + "/bin/bash";

     

       317
       320
        
             };