From f1df89f902c60017d284c7e83c597246f5a6aff0 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Feb 2016 21:53:40 +0000 Subject: [PATCH 1/2] termite: 10 -> 11 --- pkgs/applications/misc/termite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index d37f2c947c9..fe22e1c6664 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "10"; + version = "11"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2"; + sha256 = "1k91nw19c0p5ghqhs00mn9npa91idfkyiwik3ng6hb4jbnblp5ph"; }; - makeFlags = [ "VERSION=v${version}" "PREFIX=$(out)" ]; + makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; buildInputs = [ pkgconfig vte gtk3 ncurses ]; From 3f3599f6be768d31e7718eb58d57822f7cc1875e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Feb 2016 21:52:13 +0000 Subject: [PATCH 2/2] termite: split terminfo into it's own output Fixes #6141 --- pkgs/applications/misc/termite/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index fe22e1c6664..683e5db2d13 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig vte gtk3 ncurses ]; + outputs = [ "out" "terminfo" ]; + + postInstall = '' + mkdir -p $terminfo/share + mv $out/share/terminfo $terminfo/share/terminfo + + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + meta = with stdenv.lib; { description = "A simple VTE-based terminal"; license = licenses.lgpl2Plus;