From 42dcf914d13e16df9180cf9b270211263c4de88f Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 22 Sep 2017 22:55:44 +0300 Subject: [PATCH 1/2] termite: fix fonts in wayland --- pkgs/applications/misc/termite/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 837d736d10ddba..9aba91ba5411b3 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -19,6 +19,8 @@ let buildInputs = [ pkgconfig vte gtk3 ncurses ]; + nativeBuildInputs = [ makeWrapper ]; + outputs = [ "out" "terminfo" ]; postInstall = '' @@ -27,6 +29,9 @@ let mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + + wrapProgram $out/bin/termite \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { From 4d4c32504a1fe24c94b9823d0fac018d4ad9c690 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 24 Sep 2017 14:47:14 +0100 Subject: [PATCH 2/2] termite: use wrapGAppsHook --- pkgs/applications/misc/termite/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 9aba91ba5411b3..cf99304473c112 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, symlinkJoin +{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin , configFile ? null }: -let +let version = "12"; termite = stdenv.mkDerivation { name = "termite-${version}"; @@ -17,9 +17,9 @@ let makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ pkgconfig vte gtk3 ncurses ]; + buildInputs = [ vte gtk3 ncurses ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; outputs = [ "out" "terminfo" ]; @@ -29,9 +29,6 @@ let mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - - wrapProgram $out/bin/termite \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; {