diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 18:25:27 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:54 -0400 |
| commit | 7a733ceda45d9e7842685523cfebeee07aaa3f97 (patch) | |
| tree | b8214cdc61460172964891304a41a70c37cbb037 | |
| parent | f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 (diff) | |
| download | nixpkgs-7a733ceda45d9e7842685523cfebeee07aaa3f97.tar nixpkgs-7a733ceda45d9e7842685523cfebeee07aaa3f97.tar.gz nixpkgs-7a733ceda45d9e7842685523cfebeee07aaa3f97.tar.bz2 nixpkgs-7a733ceda45d9e7842685523cfebeee07aaa3f97.tar.lz nixpkgs-7a733ceda45d9e7842685523cfebeee07aaa3f97.tar.xz nixpkgs-7a733ceda45d9e7842685523cfebeee07aaa3f97.tar.zst nixpkgs-7a733ceda45d9e7842685523cfebeee07aaa3f97.zip | |
cross stdenv: No more native-fishing hack.
The comment says it was put there for pkgconfig, but now pkgconfig has been dealt with.
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 11 |
1 files changed, 0 insertions, 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 |