summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authordavidak <git@davidak.de>2018-03-27 00:29:58 +0200
committerdavidak <git@davidak.de>2018-03-27 14:45:40 +0200
commit64340f42c1a137c7980b0d24557e491a93c806de (patch)
tree95abe61b4786ba34f0afe7ceeffaafa7becd3925 /pkgs/desktops
parent2456060458befca5f16b2a1dfd1efe895b83e004 (diff)
downloadnixlib-64340f42c1a137c7980b0d24557e491a93c806de.tar
nixlib-64340f42c1a137c7980b0d24557e491a93c806de.tar.gz
nixlib-64340f42c1a137c7980b0d24557e491a93c806de.tar.bz2
nixlib-64340f42c1a137c7980b0d24557e491a93c806de.tar.lz
nixlib-64340f42c1a137c7980b0d24557e491a93c806de.tar.xz
nixlib-64340f42c1a137c7980b0d24557e491a93c806de.tar.zst
nixlib-64340f42c1a137c7980b0d24557e491a93c806de.zip
pantheon-terminal: fixes #10171 Using the 'memory' GSettings backend
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index 22e790784d57..7f259d669547 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }:
+{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   majorVersion = "0.4";
@@ -9,19 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
   };
 
-  preConfigure = ''
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig"
-  '';
-
-  preFixup = ''
-    for f in $out/bin/*; do
-      wrapProgram $f \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
-    done
-  '';
-
   nativeBuildInputs = [
-    perl cmake vala_0_38 pkgconfig makeWrapper
+    perl cmake vala_0_38 pkgconfig wrapGAppsHook
     # For setup hook
     gobjectIntrospection
   ];