diff options
author | Felix Buehler <account@buehler.rocks> | 2023-02-14 20:50:47 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2023-07-24 21:59:17 +0200 |
commit | 099935b62402f4328d96ff0331d25f98414e45ae (patch) | |
tree | 43e40feff079cf04aa286bfcd26e2257b9447c49 /pkgs | |
parent | de272e4bcdeb221500fdd3b174fa2574349d48ec (diff) | |
download | nixpkgs-099935b62402f4328d96ff0331d25f98414e45ae.tar nixpkgs-099935b62402f4328d96ff0331d25f98414e45ae.tar.gz nixpkgs-099935b62402f4328d96ff0331d25f98414e45ae.tar.bz2 nixpkgs-099935b62402f4328d96ff0331d25f98414e45ae.tar.lz nixpkgs-099935b62402f4328d96ff0331d25f98414e45ae.tar.xz nixpkgs-099935b62402f4328d96ff0331d25f98414e45ae.tar.zst nixpkgs-099935b62402f4328d96ff0331d25f98414e45ae.zip |
treewide: use lib.optionalAttrs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/release/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/release/nix-build.nix | 6 | ||||
-rw-r--r-- | pkgs/build-support/release/source-tarball.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 23 |
4 files changed, 18 insertions, 19 deletions
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index ee414ea3280..d09f6c8568b 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -5,7 +5,7 @@ with pkgs; rec { sourceTarball = args: import ./source-tarball.nix ( - { inherit stdenv autoconf automake libtool; + { inherit lib stdenv autoconf automake libtool; } // args); makeSourceTarball = sourceTarball; # compatibility diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 583831d4821..348cd5b8345 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -154,8 +154,8 @@ stdenv.mkDerivation ( // - (if buildOutOfSourceTree - then { + (lib.optionalAttrs buildOutOfSourceTree + { preConfigure = # Build out of source tree and make the source tree read-only. This # helps catch violations of the GNU Coding Standards (info @@ -170,5 +170,5 @@ stdenv.mkDerivation ( ${lib.optionalString (preConfigure != null) preConfigure} ''; } - else {}) + ) ) diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index d624d071cc2..fbc8bc6b258 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -10,7 +10,7 @@ if officialRelease then "" else "pre${toString (src.rev or src.revCount or "")}" -, src, stdenv, autoconf, automake, libtool +, src, lib, stdenv, autoconf, automake, libtool , # By default, provide all the GNU Build System as input. bootstrapBuildInputs ? [ autoconf automake libtool ] , ... } @ args: @@ -73,7 +73,7 @@ stdenv.mkDerivation ( } # Then, the caller-supplied attributes. - // args // + // (builtins.removeAttrs args [ "lib" ]) // # And finally, our own stuff. { @@ -117,7 +117,7 @@ stdenv.mkDerivation ( version = version + versionSuffix; }; - meta = (if args ? meta then args.meta else {}) // { + meta = (lib.optionalAttrs (args ? meta) args.meta) // { description = "Source distribution"; # Tarball builds are generally important, so give them a high diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f41abd81151..34407b4d35b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15545,7 +15545,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.8" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "4.8"); isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -15559,7 +15559,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "4.9" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "4.9"); isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -15576,7 +15576,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "6" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "6"); # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15595,7 +15595,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "7" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "7"); # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15610,7 +15610,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "8" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "8"); # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15625,7 +15625,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "9" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "9"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15637,7 +15637,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "10" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "10"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15649,7 +15649,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "11" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "11"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15661,7 +15661,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor "12" else { }; + threadsCross = lib.optionalAttrs (stdenv.targetPlatform != stdenv.buildPlatform) (threadsCrossFor "12"); isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -21340,8 +21340,7 @@ with pkgs; threadsCross = threadsCrossFor null; threadsCrossFor = cc_version: - if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) - then { + lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) { # other possible values: win32 or posix model = "mcf"; # For win32 or posix set this to null @@ -21349,7 +21348,7 @@ with pkgs; if cc_version == null || lib.versionAtLeast cc_version "13" then targetPackages.windows.mcfgthreads or windows.mcfgthreads else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13; - } else { }; + }; wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; |