From 7a733ceda45d9e7842685523cfebeee07aaa3f97 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 18:25:27 -0400 Subject: [PATCH] cross stdenv: No more native-fishing hack. The comment says it was put there for pkgconfig, but now pkgconfig has been dealt with. --- pkgs/stdenv/adapters.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 25ee9adfd9d..1a55b06ef36 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -88,20 +88,9 @@ rec { # 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 - # nativeBuildInput. - 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 hostAsNativeDrv buildInputsNotNull; in stdenv.mkDerivation (args // { nativeBuildInputs = nativeBuildInputs - ++ nativeInputsFromBuildInputs ++ stdenv.lib.optional selfNativeBuildInput nativeDrv # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs