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

Merge pull request #67320 from jtojnar/at-spi-bus-launcher-schemas

Browse Source 
at-spi2-core: wrap at-spi-bus-launcher
This commit is contained in:
Jan Tojnar 2019-08-24 00:46:25 +02:00 committed by GitHub
commit 2e1f99061e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/at-spi2-core/default.nix
View File

@ -5,6 +5,8 @@
, ninja , ninja
, pkgconfig , pkgconfig
, gobject-introspection , gobject-introspection
, gsettings-desktop-schemas
, makeWrapper
, dbus , dbus
, glib , glib
@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; 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 # Fixup rpaths because of meson, remove with meson-0.47
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ dbus glib libX11 libXtst libXi ]; 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; { meta = with stdenv.lib; {
description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus";
homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core;