From d15fedbcc0ac0a8c59d5b6c92191df6d889c05f1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 16 May 2016 10:18:27 +0300
Subject: rxvt: put suffixes where they belong

---
 pkgs/applications/misc/rxvt_unicode/default.nix | 5 ++---
 pkgs/applications/misc/rxvt_unicode/wrapper.nix | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications/misc/rxvt_unicode')

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 8f195555cf1a..5d1eda5ec063 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -3,14 +3,13 @@
   unicode3Support }:
 
 let
-  name = "rxvt-unicode";
+  pname = "rxvt-unicode";
   version = "9.22";
-  n = "${name}-${version}";
 in
 
 stdenv.mkDerivation (rec {
 
-  name = "${n}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}";
+  name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}";
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
index c9b0823fb51f..de37327fbead 100644
--- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix
+++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
@@ -4,9 +4,10 @@ let
   rxvt = rxvt_unicode.override {
     perlSupport = true;
   };
+  rxvt_name = builtins.parseDrvName rxvt.name;
 
 in symlinkJoin {
-  name = "${rxvt.name}-with-plugins";
+  name = "${rxvt_name.name}-with-plugins-${rxvt_name.version}";
 
   paths = [ rxvt ] ++ plugins;
 
-- 
cgit 1.4.1