From aa8868c7cca8d30706a68a876d048968c83e1cf1 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 24 Jan 2021 10:02:59 +0700 Subject: [PATCH] pkgs/build-support: stdenv.lib -> lib --- pkgs/build-support/bintools-wrapper/default.nix | 15 ++++++++------- pkgs/build-support/cc-wrapper/default.nix | 17 +++++++++-------- .../pkg-config-wrapper/default.nix | 2 +- pkgs/build-support/release/ant-build.nix | 16 ++++++++-------- pkgs/build-support/release/debian-build.nix | 2 +- pkgs/build-support/release/default.nix | 2 +- pkgs/stdenv/darwin/default.nix | 3 ++- pkgs/stdenv/linux/default.nix | 3 +++ 8 files changed, 33 insertions(+), 27 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index e0d43739668..e960a245528 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -6,6 +6,7 @@ # compiler and the linker just "work". { name ? "" +, lib , stdenvNoCC , bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" @@ -15,7 +16,7 @@ , useMacosReexportHack ? false }: -with stdenvNoCC.lib; +with lib; assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> @@ -31,11 +32,11 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); - bintoolsVersion = stdenv.lib.getVersion bintools; - bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools); + bintoolsVersion = lib.getVersion bintools; + bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools); libc_bin = if libc == null then null else getBin libc; libc_dev = if libc == null then null else getDev libc; @@ -62,7 +63,7 @@ let else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" - else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" + else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; expand-response-params = @@ -326,10 +327,10 @@ stdenv.mkDerivation { let bintools_ = if bintools != null then bintools else {}; in (if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) // { description = - stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; priority = 10; } // optionalAttrs useMacosReexportHack { - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 212fd6b570a..341e2850437 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,6 +6,7 @@ # compiler and the linker just "work". { name ? "" +, lib , stdenvNoCC , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , gccForLibs ? null @@ -18,7 +19,7 @@ , libcxx ? null }: -with stdenvNoCC.lib; +with lib; assert nativeTools -> !propagateDoc && nativePrefix != ""; assert !nativeTools -> @@ -34,11 +35,11 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = lib.optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); - ccVersion = stdenv.lib.getVersion cc; - ccName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName cc); + ccVersion = lib.getVersion cc; + ccName = lib.removePrefix targetPrefix (lib.getName cc); libc_bin = if libc == null then null else getBin libc; libc_dev = if libc == null then null else getDev libc; @@ -247,8 +248,8 @@ stdenv.mkDerivation { setupHooks = [ ../setup-hooks/role.bash - ] ++ stdenv.lib.optional (cc.langC or true) ./setup-hook.sh - ++ stdenv.lib.optional (cc.langFortran or false) ./fortran-hook.sh; + ] ++ lib.optional (cc.langC or true) ./setup-hook.sh + ++ lib.optional (cc.langFortran or false) ./fortran-hook.sh; postFixup = # Ensure flags files exists, as some other programs cat them. (That these @@ -353,7 +354,7 @@ stdenv.mkDerivation { + optionalString (libcxx.isLLVM or false) ('' echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + '' + lib.optionalString stdenv.targetPlatform.isLinux '' echo "-lc++abi" >> $out/nix-support/libcxx-ldflags '') @@ -492,7 +493,7 @@ stdenv.mkDerivation { let cc_ = if cc != null then cc else {}; in (if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) // { description = - stdenv.lib.attrByPath ["meta" "description"] "System C compiler" cc_ + lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; priority = 10; }; diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index b61936c50a8..bbc49d6728c 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -10,7 +10,7 @@ , extraPackages ? [], extraBuildCommands ? "" }: -with stdenvNoCC.lib; +with lib; let stdenv = stdenvNoCC; 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} <