diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
| commit | 811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch) | |
| tree | 631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/stdenv/generic/default.nix | |
| parent | c34932ef86628b8b30284882d8baaef4c56320dd (diff) | |
| parent | a2c7804903cdd41d1905fa954bd2dba5e165e793 (diff) | |
| download | nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.gz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.bz2 nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.lz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.xz nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.zst nixpkgs-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.zip | |
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts: pkgs/tools/security/gnupg/default.nix
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 5fb4f4ff2b8..baa54f6db03 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -44,6 +44,8 @@ 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/move-sbin.sh + ../../build-support/setup-hooks/move-lib64.sh gcc ]; @@ -91,12 +93,12 @@ let __ignoreNulls = true; # Inputs built by the cross compiler. - buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs'); - propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs; + buildInputs = if crossConfig != null then buildInputs ++ extraBuildInputs' else []; + propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else []; # Inputs built by the usual native compiler. - nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) (buildInputs ++ extraBuildInputs'); + nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs ++ extraBuildInputs' else []); propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ - lib.optionals (crossConfig == null) propagatedBuildInputs; + (if crossConfig == null then propagatedBuildInputs else []); }))) ( { # The meta attribute is passed in the resulting attribute set, |