From fdc0edff3e5fa0f900e3b296ec3c0285b9708115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 22 Mar 2016 08:41:10 -0300 Subject: [PATCH] gnome-terminal: refactor wrapping variables in binaries --- .../3.18/core/gnome-terminal/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix index 3bbb25ca5c1..052a16affdc 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix @@ -1,27 +1,22 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango , gnome_doc_utils, intltool, libX11, which, libuuid, vala -, desktop_file_utils, itstool, makeWrapper, appdata-tools }: +, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool makeWrapper gnome3.nautilus vala ]; + gnome3.dconf itstool gnome3.nautilus vala ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 + desktop_file_utils wrapGAppsHook ]; # FIXME: enable for gnome3 configureFlags = [ "--disable-search-provider" "--disable-migration" ]; - preFixup = '' - for f in "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - done - ''; - meta = with stdenv.lib; { + description = "The GNOME Terminal Emulator"; + homepage = https://wiki.gnome.org/Apps/Terminal/; platforms = platforms.linux; maintainers = gnome3.maintainers; };