diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-05 01:54:34 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-05 01:59:24 +0200 |
| commit | ce61353a9f818ec12eca5a771f1974d2a7210bf4 (patch) | |
| tree | b19f14523b933699b7a549abedd1e9216b8cee30 /pkgs | |
| parent | 97220c973fdc6d3cfa02fe597c4301e87177603c (diff) | |
| download | nixpkgs-ce61353a9f818ec12eca5a771f1974d2a7210bf4.tar nixpkgs-ce61353a9f818ec12eca5a771f1974d2a7210bf4.tar.gz nixpkgs-ce61353a9f818ec12eca5a771f1974d2a7210bf4.tar.bz2 nixpkgs-ce61353a9f818ec12eca5a771f1974d2a7210bf4.tar.lz nixpkgs-ce61353a9f818ec12eca5a771f1974d2a7210bf4.tar.xz nixpkgs-ce61353a9f818ec12eca5a771f1974d2a7210bf4.tar.zst nixpkgs-ce61353a9f818ec12eca5a771f1974d2a7210bf4.zip | |
Eliminate some optionals/optionalAttrs calls on the hot path
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 29e4455f7cb..399843c2760 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -115,12 +115,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, |