public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix termite-with-config's terminfo

Browse Source 
The level of indirection introduced by termite-with-config didn't mesh
well with the terminfo database. This is solved by using symlinkJoin so
the environment is properly propagated.
This commit is contained in:
Yacine Hmito 2016-09-28 12:11:50 +02:00
parent 90e9ad2106
commit 9375da7c72
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/termite/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper { stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, symlinkJoin
, configFile ? null , configFile ? null
}: }:
@ -37,13 +37,13 @@ let
platforms = platforms.all; platforms = platforms.all;
}; };
}; };
in if configFile == null then termite else stdenv.mkDerivation { in if configFile == null then termite else symlinkJoin {
name = "termite-with-config-${version}"; name = "termite-with-config-${version}";
paths = [ termite ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildCommand = '' postBuild = ''
mkdir -p $out/etc/xdg/termite/ $out/bin wrapProgram $out/bin/termite \
ln -s ${termite}/bin/termite $out/bin/termite --add-flags "--config ${configFile}"
wrapProgram $out/bin/termite --add-flags "--config ${configFile}"
''; '';
passthru.terminfo = termite.terminfo; passthru.terminfo = termite.terminfo;
} }