diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-02 14:33:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-02 14:33:33 +0000 |
| commit | 6bb95494e796537e5b783197d38700a3b9f8d0e8 (patch) | |
| tree | d7adb8c9649f8e028a792bbde28cf357bd12cab7 /pkgs/build-support/release | |
| parent | 84a0bd9c837b3927d3c64b533a082f400738dfa8 (diff) | |
| download | nixpkgs-6bb95494e796537e5b783197d38700a3b9f8d0e8.tar nixpkgs-6bb95494e796537e5b783197d38700a3b9f8d0e8.tar.gz nixpkgs-6bb95494e796537e5b783197d38700a3b9f8d0e8.tar.bz2 nixpkgs-6bb95494e796537e5b783197d38700a3b9f8d0e8.tar.lz nixpkgs-6bb95494e796537e5b783197d38700a3b9f8d0e8.tar.xz nixpkgs-6bb95494e796537e5b783197d38700a3b9f8d0e8.tar.zst nixpkgs-6bb95494e796537e5b783197d38700a3b9f8d0e8.zip | |
* Use the version attribute if available.
svn path=/nixpkgs/trunk/; revision=14297
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/debian-build.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/release/nix-build.nix | 2 | ||||
| -rw-r--r-- | 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; |