rxvt: put suffixes where they belong

This commit is contained in:
Evgeny Egorochkin 2016-05-16 10:18:27 +03:00
parent d9ee918547
commit d15fedbcc0
2 changed files with 4 additions and 4 deletions

View File

@ -3,14 +3,13 @@
unicode3Support }: unicode3Support }:
let let
name = "rxvt-unicode"; pname = "rxvt-unicode";
version = "9.22"; version = "9.22";
n = "${name}-${version}";
in in
stdenv.mkDerivation (rec { 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 { src = fetchurl {
url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";

View File

@ -4,9 +4,10 @@ let
rxvt = rxvt_unicode.override { rxvt = rxvt_unicode.override {
perlSupport = true; perlSupport = true;
}; };
rxvt_name = builtins.parseDrvName rxvt.name;
in symlinkJoin { in symlinkJoin {
name = "${rxvt.name}-with-plugins"; name = "${rxvt_name.name}-with-plugins-${rxvt_name.version}";
paths = [ rxvt ] ++ plugins; paths = [ rxvt ] ++ plugins;