diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
| commit | 50053cda79099c9a0b2a7803aef61f730a54848f (patch) | |
| tree | 6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/pkgs/stdenv | |
| parent | 7fbd32a525182f2089e1098723219a1a4ef264bb (diff) | |
| parent | 36f316007494c388df1fec434c1e658542e3c3cc (diff) | |
| download | nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2 nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip | |
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/pkgs/stdenv')
| -rw-r--r-- | nixpkgs/pkgs/stdenv/generic/default.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/stdenv/generic/make-derivation.nix | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/stdenv/generic/default.nix b/nixpkgs/pkgs/stdenv/generic/default.nix index f77f43aea886..04117de32693 100644 --- a/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/nixpkgs/pkgs/stdenv/generic/default.nix @@ -47,6 +47,7 @@ let ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/strip.sh ../../build-support/setup-hooks/patch-shebangs.sh + ../../build-support/setup-hooks/prune-libtool-files.sh ] # FIXME this on Darwin; see # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369 @@ -122,7 +123,9 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD - isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; + isi686 isx86_32 isx86_64 + is32bit is64bit + isAarch32 isAarch64 isMips isBigEndian; isArm = lib.warn "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; diff --git a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index fdb3a2ce35a2..cafd1031ab8b 100644 --- a/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -123,14 +123,14 @@ rec { (map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild) (map (drv: drv.nativeDrv or drv) nativeBuildInputs ++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh - ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh) + ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh + ++ lib.optionals doCheck checkInputs + ++ lib.optionals doInstallCheck' installCheckInputs) (map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget) ] [ (map (drv: drv.__spliced.hostHost or drv) depsHostHost) - (map (drv: drv.crossDrv or drv) (buildInputs - ++ lib.optionals doCheck checkInputs - ++ lib.optionals doInstallCheck' installCheckInputs)) + (map (drv: drv.crossDrv or drv) buildInputs) ] [ (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget) |