From f577861b8a933f2ac060d609f442047af965471e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Mar 2019 17:33:08 +0100 Subject: [PATCH] ibus: remove gconf dependency from runtime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wrapGAppsHook adds gconf to runtime even though we only need gsettings-schema-convert utility during build. This decreases the closure size 514M → 394M --- pkgs/tools/inputmethods/ibus/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index b561fb626e05..e1cd8ad09fbd 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig +{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null @@ -59,6 +59,13 @@ let makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; + + # stop gconf from leaking into environment + # can be removed in ibus 1.6 which will not use gconf anymore + gsettings-schema-convert = runCommand "name" {} '' + mkdir -p $out/bin + ln -s ${gconf}/bin/gsettings-schema-convert $out/bin + ''; in stdenv.mkDerivation rec { @@ -97,7 +104,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - gconf + gsettings-schema-convert gtk-doc intltool makeWrapper