diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-03-02 17:33:08 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-03-02 17:42:16 +0100 |
| commit | f577861b8a933f2ac060d609f442047af965471e (patch) | |
| tree | 66908fc810995ce77a96b88c77629ef4ade96e9c /pkgs/tools/inputmethods/ibus | |
| parent | 025c2abd08de80609b961c8c8176a2be390a6d88 (diff) | |
| download | nixpkgs-f577861b8a933f2ac060d609f442047af965471e.tar nixpkgs-f577861b8a933f2ac060d609f442047af965471e.tar.gz nixpkgs-f577861b8a933f2ac060d609f442047af965471e.tar.bz2 nixpkgs-f577861b8a933f2ac060d609f442047af965471e.tar.lz nixpkgs-f577861b8a933f2ac060d609f442047af965471e.tar.xz nixpkgs-f577861b8a933f2ac060d609f442047af965471e.tar.zst nixpkgs-f577861b8a933f2ac060d609f442047af965471e.zip | |
ibus: remove gconf dependency from runtime
wrapGAppsHook adds gconf to runtime even though we only need gsettings-schema-convert utility during build. This decreases the closure size 514M → 394M
Diffstat (limited to 'pkgs/tools/inputmethods/ibus')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index b561fb626e0..e1cd8ad09fb 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 |