diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-26 14:34:29 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-26 14:34:29 +0000 |
commit | 79072e871fafb7e053e9b93201b229f6a0c961b2 (patch) | |
tree | 942f5787ec845e5b684ef5eee815d7942ad0e376 /pkgs/build-support | |
parent | 564b82630be242e9968b8f6bc16b59986552d5fa (diff) |
* Preserve meta attributes from the caller.
svn path=/nixpkgs/trunk/; revision=13433
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/release/debian-build.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/release/make-source-tarball.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/release/nix-build.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/release/rpm-build.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 3fe4dac25b7de..fad216fb1c24a 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -70,7 +70,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( done ''; # */ - meta = { + meta = (if args ? meta then args.meta else {}) // { description = "Build of a Deb package on ${args.diskImage.fullName} (${args.diskImage.name})"; }; } diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix index f3a9f16889344..e92ad2dea1055 100644 --- a/pkgs/build-support/release/make-source-tarball.nix +++ b/pkgs/build-support/release/make-source-tarball.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation ( passthru = {inherit src;}; - meta = { + meta = (if args ? meta then args.meta else {}) // { description = "Build of a source distribution from a checkout"; }; diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 1c210fc7e6775..5257c2c742499 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation ( '' else ""; - meta = { + meta = (if args ? meta then args.meta else {}) // { description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}"; }; diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index b9e0d7c508c51..88273b5958ccb 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -33,7 +33,7 @@ vmTools.buildRPM ( done ''; # */ - meta = { + meta = (if args ? meta then args.meta else {}) // { description = "Build of an RPM package on ${args.diskImage.fullName} (${args.diskImage.name})"; }; } |