From 79072e871fafb7e053e9b93201b229f6a0c961b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Nov 2008 14:34:29 +0000
Subject: * Preserve meta attributes from the caller.

svn path=/nixpkgs/trunk/; revision=13433
---
 pkgs/build-support/release/debian-build.nix        | 2 +-
 pkgs/build-support/release/make-source-tarball.nix | 2 +-
 pkgs/build-support/release/nix-build.nix           | 2 +-
 pkgs/build-support/release/rpm-build.nix           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/build-support')

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})";
     };
   }
-- 
cgit 1.4.1