forked from mirrors/nixpkgs
* Preserve meta attributes from the caller.
svn path=/nixpkgs/trunk/; revision=13433
This commit is contained in:
parent
564b82630b
commit
79072e871f
|
@ -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})";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
@ -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}";
|
||||
};
|
||||
|
||||
|
|
|
@ -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})";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue