From ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Dec 2012 19:20:09 +0100 Subject: Rename buildNativeInputs -> nativeBuildInputs Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs" sounds like an imperative rather than a noun phrase. --- pkgs/stdenv/adapters.nix | 22 +++++++++++----------- pkgs/stdenv/generic/default.nix | 8 ++++---- pkgs/stdenv/generic/setup.sh | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'pkgs/stdenv') diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1ee88a821166..a354c1b6bd48 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -124,9 +124,9 @@ rec { # Return a modified stdenv that adds a cross compiler to the # builds. makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // - { mkDerivation = {name ? "", buildInputs ? [], buildNativeInputs ? [], - propagatedBuildInputs ? [], propagatedBuildNativeInputs ? [], - selfBuildNativeInput ? false, ...}@args: let + { mkDerivation = {name ? "", buildInputs ? [], nativeBuildInputs ? [], + propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [], + selfNativeBuildInput ? false, ...}@args: let # *BuildInputs exists temporarily as another name for # *HostInputs. @@ -135,21 +135,21 @@ rec { # and we handle that through isAttrs. getBuildDrv = drv : if (builtins.isAttrs drv && drv ? nativeDrv) then drv.nativeDrv else drv; getHostDrv = drv : if (builtins.isAttrs drv && drv ? crossDrv) then drv.crossDrv else drv; - buildNativeInputsDrvs = map (getBuildDrv) buildNativeInputs; + nativeBuildInputsDrvs = map (getBuildDrv) nativeBuildInputs; buildInputsDrvs = map (getHostDrv) buildInputs; buildInputsDrvsAsBuildInputs = map (getBuildDrv) buildInputs; propagatedBuildInputsDrvs = map (getHostDrv) (propagatedBuildInputs); - propagatedBuildNativeInputsDrvs = map (getBuildDrv) - (propagatedBuildNativeInputs); + propagatedNativeBuildInputsDrvs = map (getBuildDrv) + (propagatedNativeBuildInputs); - # The base stdenv already knows that buildNativeInputs and + # The base stdenv already knows that nativeBuildInputs and # buildInputs should be built with the usual gcc-wrapper # And the same for propagatedBuildInputs. nativeDrv = stdenv.mkDerivation args; # Temporary expression until the cross_renaming, to handle the # case of pkgconfig given as buildInput, but to be used as - # buildNativeInput. + # nativeBuildInput. hostAsBuildDrv = drv: builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath; @@ -162,10 +162,10 @@ rec { crossDrv = if (cross == null) then nativeDrv else stdenv.mkDerivation (args // { name = name + "-" + cross.config; - buildNativeInputs = buildNativeInputsDrvs + nativeBuildInputs = nativeBuildInputsDrvs ++ nativeInputsFromBuildInputs ++ [ gccCross binutilsCross ] ++ - stdenv.lib.optional selfBuildNativeInput nativeDrv; + stdenv.lib.optional selfNativeBuildInput nativeDrv; # Cross-linking dynamic libraries, every buildInput should # be propagated because ld needs the -rpath-link to find @@ -174,7 +174,7 @@ rec { buildInputs = []; propagatedBuildInputs = propagatedBuildInputsDrvs ++ buildInputsDrvs; - propagatedBuildNativeInputs = propagatedBuildNativeInputsDrvs; + propagatedNativeBuildInputs = propagatedNativeBuildInputsDrvs; crossConfig = cross.config; } // (if args ? crossAttrs then args.crossAttrs else {})); diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 311f66241c82..e64543ede62c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -48,9 +48,9 @@ let (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) // (let buildInputs = attrs.buildInputs or []; - buildNativeInputs = attrs.buildNativeInputs or []; + nativeBuildInputs = attrs.nativeBuildInputs or []; propagatedBuildInputs = attrs.propagatedBuildInputs or []; - propagatedBuildNativeInputs = attrs.propagatedBuildNativeInputs or []; + propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; crossConfig = attrs.crossConfig or null; in { @@ -65,9 +65,9 @@ let propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs; # Inputs built by the usual native compiler. - buildNativeInputs = buildNativeInputs ++ lib.optionals + nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) buildInputs; - propagatedBuildNativeInputs = propagatedBuildNativeInputs ++ + propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ lib.optionals (crossConfig == null) propagatedBuildInputs; })) ) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 221254a36ed3..c5722c3e8749 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -169,8 +169,8 @@ for i in $buildInputs $propagatedBuildInputs; do done nativePkgs="" -for i in $buildNativeInputs $propagatedBuildNativeInputs; do - findInputs $i nativePkgs propagated-build-native-inputs +for i in $nativeBuildInputs $propagatedNativeBuildInputs; do + findInputs $i nativePkgs propagated-native-build-inputs done @@ -748,9 +748,9 @@ fixupPhase() { echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" fi - if [ -n "$propagatedBuildNativeInputs" ]; then + if [ -n "$propagatedNativeBuildInputs" ]; then mkdir -p "$out/nix-support" - echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" + echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs" fi if [ -n "$propagatedUserEnvPkgs" ]; then -- cgit 1.4.1