From 9375da7c724bcf76eeb107769aee64561b9cd51a Mon Sep 17 00:00:00 2001 From: Yacine Hmito Date: Wed, 28 Sep 2016 12:11:50 +0200 Subject: [PATCH] Fix termite-with-config's terminfo 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. --- pkgs/applications/misc/termite/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 33c42e3dc1dd..a118f16c5496 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper +{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, symlinkJoin , configFile ? null }: @@ -37,13 +37,13 @@ let 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}"; + paths = [ termite ]; nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' - mkdir -p $out/etc/xdg/termite/ $out/bin - ln -s ${termite}/bin/termite $out/bin/termite - wrapProgram $out/bin/termite --add-flags "--config ${configFile}" + postBuild = '' + wrapProgram $out/bin/termite \ + --add-flags "--config ${configFile}" ''; passthru.terminfo = termite.terminfo; }