From 6bb95494e796537e5b783197d38700a3b9f8d0e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Mar 2009 14:33:33 +0000 Subject: [PATCH] * Use the version attribute if available. svn path=/nixpkgs/trunk/; revision=14297 --- pkgs/build-support/release/debian-build.nix | 2 +- pkgs/build-support/release/nix-build.nix | 2 +- pkgs/build-support/release/rpm-build.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 5144e3169e5..85f6a73cda3 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -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; diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 142bd7bc362..0359828efeb 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -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; diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index b094732f9b7..d2d8ea65c22 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -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;