dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #56715 from jtojnar/ibus-no-gconf

Browse Source 
ibus: remove gconf dependency from runtime
This commit is contained in:
Jan Tojnar 2019-03-06 00:14:22 +01:00 committed by GitHub
commit b2b29d24f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/inputmethods/ibus/default.nix
View File

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