rxvt_unicode-with-plugins: use symlinkJoin

This commit is contained in:
Nikolay Amiantov 2016-04-26 15:27:05 +03:00
parent d40e636bdc
commit c1e9ea6c86
1 changed files with 13 additions and 20 deletions

View File

@ -1,28 +1,21 @@
{ stdenv, buildEnv, rxvt_unicode, makeWrapper, plugins }: { stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }:
let let
rxvt = rxvt_unicode.override { rxvt = rxvt_unicode.override {
perlSupport = true; perlSupport = true;
}; };
drv = buildEnv { in symlinkJoin {
name = "${rxvt.name}-with-plugins"; name = "${rxvt.name}-with-plugins";
paths = [ rxvt ] ++ plugins; paths = [ rxvt ] ++ plugins;
postBuild = '' buildInputs = [ makeWrapper ];
# TODO: This could be avoided if buildEnv could be forced to create all directories
if [ -L $out/bin ]; then postBuild = ''
rm $out/bin wrapProgram $out/bin/urxvt \
mkdir $out/bin --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
for i in ${rxvt}/bin/*; do wrapProgram $out/bin/urxvtd \
ln -s $i $out/bin --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
done '';
fi }
wrapProgram $out/bin/urxvt \
--suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
wrapProgram $out/bin/urxvtd \
--suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
'';
};
in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })