Merge pull request #14117 from romildo/fix.gnome-terminal

gnome-terminal: refactor wrapping variables in binaries
This commit is contained in:
Luca Bruno 2016-03-22 13:33:39 +01:00
commit 3cc7e65729

View file

@ -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;
};