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/build-support/release | |
| 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/build-support/release')
| -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 |
3 files changed, 7 insertions, 7 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 |