diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-24 00:46:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-24 00:46:25 +0200 |
| commit | 2e1f99061eca2733eef2eedc0a6d22b13d24b592 (patch) | |
| tree | 870a51ed5506518da6568f2c0dc184ccf6bfec24 | |
| parent | 6abd6c36d26306973c5a26ef14ed6f67bfaf74d4 (diff) | |
| parent | 1adfc32c01a60553cbae532bc2e41ff30b614d6e (diff) | |
| download | nixlib-2e1f99061eca2733eef2eedc0a6d22b13d24b592.tar nixlib-2e1f99061eca2733eef2eedc0a6d22b13d24b592.tar.gz nixlib-2e1f99061eca2733eef2eedc0a6d22b13d24b592.tar.bz2 nixlib-2e1f99061eca2733eef2eedc0a6d22b13d24b592.tar.lz nixlib-2e1f99061eca2733eef2eedc0a6d22b13d24b592.tar.xz nixlib-2e1f99061eca2733eef2eedc0a6d22b13d24b592.tar.zst nixlib-2e1f99061eca2733eef2eedc0a6d22b13d24b592.zip | |
Merge pull request #67320 from jtojnar/at-spi-bus-launcher-schemas
at-spi2-core: wrap at-spi-bus-launcher
| -rw-r--r-- | pkgs/development/libraries/at-spi2-core/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 644d4e29c301..21649d1728c0 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -5,6 +5,8 @@ , ninja , pkgconfig , gobject-introspection +, gsettings-desktop-schemas +, makeWrapper , dbus , glib @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ] + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ] # Fixup rpaths because of meson, remove with meson-0.47 ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ dbus glib libX11 libXtst libXi ]; @@ -46,6 +48,13 @@ stdenv.mkDerivation rec { }; }; + postFixup = '' + # Cannot use wrapGAppsHook'due to a dependency cycle + wrapProgram $out/libexec/at-spi-bus-launcher \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} + ''; + meta = with stdenv.lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; |