diff options
author | Evgeny Egorochkin <phreedom@yandex.ru> | 2016-05-16 10:18:27 +0300 |
---|---|---|
committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2016-05-16 10:19:38 +0300 |
commit | d15fedbcc0ac0a8c59d5b6c92191df6d889c05f1 (patch) | |
tree | 0650b46e4cc0b8233131773280c911c51073c9c1 /pkgs/applications/misc | |
parent | d9ee9185474445a184a965bb3864225313c6675a (diff) |
rxvt: put suffixes where they belong
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/rxvt_unicode/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/misc/rxvt_unicode/wrapper.nix | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 8f195555cf1ab..5d1eda5ec0634 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 c9b0823fb51f8..de37327fbeadf 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; |