More renames

pkgs/stdenv/adapters.nix

@@ -130,13 +130,13 @@ rec {
 
             # In nixpkgs, sometimes 'null' gets in as a buildInputs element,
             # and we handle that through isAttrs.
-            getBuildDrv = drv: drv.nativeDrv or drv;
-            getHostDrv = drv: drv.crossDrv or drv;
-            nativeBuildInputsDrvs = map getBuildDrv nativeBuildInputs;
-            buildInputsDrvs = map getHostDrv buildInputs;
-            buildInputsDrvsAsBuildInputs = map getBuildDrv buildInputs;
-            propagatedBuildInputsDrvs = map getHostDrv propagatedBuildInputs;
-            propagatedNativeBuildInputsDrvs = map getBuildDrv propagatedNativeBuildInputs;
+            getNativeDrv = drv: drv.nativeDrv or drv;
+            getCrossDrv = drv: drv.crossDrv or drv;
+            nativeBuildInputsDrvs = map getNativeDrv nativeBuildInputs;
+            buildInputsDrvs = map getCrossDrv buildInputs;
+            buildInputsDrvsAsBuildInputs = map getNativeDrv buildInputs;
+            propagatedBuildInputsDrvs = map getCrossDrv propagatedBuildInputs;
+            propagatedNativeBuildInputsDrvs = map getNativeDrv propagatedNativeBuildInputs;
 
             # The base stdenv already knows that nativeBuildInputs and
             # buildInputs should be built with the usual gcc-wrapper
@@ -146,12 +146,12 @@ rec {
             # Temporary expression until the cross_renaming, to handle the
             # case of pkgconfig given as buildInput, but to be used as
             # nativeBuildInput.
-            hostAsBuildDrv = drv:
+            hostAsNativeDrv = drv:
                 builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath
                 == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath;
             buildInputsNotNull = stdenv.lib.filter
                 (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs;
-            nativeInputsFromBuildInputs = stdenv.lib.filter hostAsBuildDrv buildInputsNotNull;
+            nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
 
             # We should overwrite the input attributes in crossDrv, to overwrite
             # the defaults for only-native builds in the base stdenv