diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 10:02:59 +0700 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2021-01-24 19:07:54 -0800 |
| commit | aa8868c7cca8d30706a68a876d048968c83e1cf1 (patch) | |
| tree | 0b691e6a879790086c7abb789e2f63ef4bad5950 /pkgs/build-support/release | |
| parent | e8d39a93c2950d2e3d69e52fdc10f6827ca3970b (diff) | |
| download | nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.gz nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.bz2 nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.lz nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.xz nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.tar.zst nixpkgs-aa8868c7cca8d30706a68a876d048968c83e1cf1.zip | |
pkgs/build-support: stdenv.lib -> lib
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/ant-build.nix | 16 | ||||
| -rw-r--r-- | pkgs/build-support/release/debian-build.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/release/default.nix | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 2d24d5bd704..996f4f45d07 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -1,5 +1,6 @@ { src , pkgs +, lib , stdenv ? pkgs.stdenv , name , antTargets ? [] @@ -16,8 +17,7 @@ , ... } @ args: let - antFlags = "-f ${buildfile} " + stdenv.lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ; - lib = stdenv.lib; + antFlags = "-f ${buildfile} " + lib.concatMapStrings ({name, value}: "-D${name}=${value} " ) antProperties ; in stdenv.mkDerivation ( @@ -31,7 +31,7 @@ stdenv.mkDerivation ( prePhases = ["antSetupPhase"]; - antSetupPhase = with stdenv.lib; '' + antSetupPhase = with lib; '' if test "$hydraAntLogger" != "" ; then export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`" fi @@ -46,7 +46,7 @@ stdenv.mkDerivation ( mkdir -p $out/share/java ${ if jars == [] then '' find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java - '' else stdenv.lib.concatMapStrings (j: '' + '' else lib.concatMapStrings (j: '' cp -v ${j} $out/share/java '') jars } @@ -65,7 +65,7 @@ stdenv.mkDerivation ( in '' header "Generating jar wrappers" - '' + (stdenv.lib.concatMapStrings (w: '' + '' + (lib.concatMapStrings (w: '' mkdir -p $out/bin cat >> $out/bin/${w.name} <<EOF @@ -85,7 +85,7 @@ stdenv.mkDerivation ( header "Building default ant target" ant ${antFlags} closeNest - '' else stdenv.lib.concatMapStrings (t: '' + '' else lib.concatMapStrings (t: '' header "Building '${t}' target" ant ${antFlags} ${t} closeNest @@ -103,12 +103,12 @@ stdenv.mkDerivation ( ''; } - // removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] // + // removeAttrs args ["antProperties" "buildInputs" "pkgs" "lib" "jarWrappers"] // { name = name + (if src ? version then "-" + src.version else ""); - buildInputs = [ant jre zip unzip] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ; + buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ; postHook = '' mkdir -p $out/nix-support diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 9ac335d288a..2544d5c740c 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -4,7 +4,7 @@ { name ? "debian-build" , lib , diskImage -, src, stdenv, vmTools, checkinstall +, src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false , # Features provided by this package. debProvides ? [] diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 0276fa1be61..83f755b2bec 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -15,7 +15,7 @@ rec { } // args); antBuild = args: import ./ant-build.nix ( - { inherit pkgs; + { inherit lib pkgs; } // args); mvnBuild = args: import ./maven-build.nix ( |