diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-27 23:51:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 23:51:25 +0200 |
| commit | 1ed3c93f2141a762a1c394f15366292822f245de (patch) | |
| tree | 381b58aaaf1fcc21e85ffc96604c3cded0aaf4ea /pkgs/desktops | |
| parent | cfd79b4d8a525fe875d77bc7dfd2267000a634b0 (diff) | |
| parent | 64340f42c1a137c7980b0d24557e491a93c806de (diff) | |
| download | nixlib-1ed3c93f2141a762a1c394f15366292822f245de.tar nixlib-1ed3c93f2141a762a1c394f15366292822f245de.tar.gz nixlib-1ed3c93f2141a762a1c394f15366292822f245de.tar.bz2 nixlib-1ed3c93f2141a762a1c394f15366292822f245de.tar.lz nixlib-1ed3c93f2141a762a1c394f15366292822f245de.tar.xz nixlib-1ed3c93f2141a762a1c394f15366292822f245de.tar.zst nixlib-1ed3c93f2141a762a1c394f15366292822f245de.zip | |
Merge pull request #37896 from davidak/pantheon-terminal-1
pantheon-terminal: fixes "Using the 'memory' GSettings backend" issue
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 15 |
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 ]; |