* Use the version attribute if available.

svn path=/nixpkgs/trunk/; revision=14297
This commit is contained in:
Eelco Dolstra 2009-03-02 14:33:33 +00:00
parent 84a0bd9c83
commit 6bb95494e7
3 changed files with 3 additions and 3 deletions

View file

@ -19,7 +19,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
// removeAttrs args ["vmTools"] //
{
name = name + "-" + diskImage.name + "-" + src.version;
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
src = if src ? outPath then src.outPath else src.path;

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation (
// args //
{
name = name + "-" + src.version;
name = name + (if src ? version then "-" + src.version else "");
src = if src ? outPath then src.outPath else src.path;

View file

@ -11,7 +11,7 @@ vmTools.buildRPM (
removeAttrs args ["vmTools"] //
{
name = name + "-" + diskImage.name + "-" + src.version;
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
src = if src ? outPath then src.outPath else src.path;