diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-23 04:30:31 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-08-24 00:07:39 +0200 |
| commit | 1adfc32c01a60553cbae532bc2e41ff30b614d6e (patch) | |
| tree | e8274f6705fd2a5fd0c8df26e3ae1f37a301a808 /pkgs/development/libraries/at-spi2-core | |
| parent | c5c47203dcc63aa49235b0f73124917cd94f1f31 (diff) | |
| download | nixpkgs-1adfc32c01a60553cbae532bc2e41ff30b614d6e.tar nixpkgs-1adfc32c01a60553cbae532bc2e41ff30b614d6e.tar.gz nixpkgs-1adfc32c01a60553cbae532bc2e41ff30b614d6e.tar.bz2 nixpkgs-1adfc32c01a60553cbae532bc2e41ff30b614d6e.tar.lz nixpkgs-1adfc32c01a60553cbae532bc2e41ff30b614d6e.tar.xz nixpkgs-1adfc32c01a60553cbae532bc2e41ff30b614d6e.tar.zst nixpkgs-1adfc32c01a60553cbae532bc2e41ff30b614d6e.zip | |
at-spi2-core: wrap at-spi-bus-launcher
Currently the following warnings and errors are logged on GNOME startup: Aug 22 19:34:16 kaiser dbus-daemon[1229]: [session uid=132 pid=1229] Activating via systemd: service name='org.a11y.Bus' unit='at-spi-dbus-bus.service' requested by ':1.8' (uid=132 pid=1246 comm="/nix/store/5anz kdq6src76c4lm4m98w2a8f3j2cc4-gnome-" label="kernel") Aug 22 19:34:16 kaiser systemd[1223]: Starting Accessibility services bus... Aug 22 19:34:16 kaiser at-spi-bus-laun[1341]: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications. Aug 22 19:34:16 kaiser dbus-daemon[1229]: [session uid=132 pid=1229] Successfully activated service 'org.a11y.Bus' Aug 22 19:34:16 kaiser systemd[1223]: Started Accessibility services bus. Aug 22 19:34:16 kaiser at-spi-bus-launcher[1341]: dbus-daemon[1345]: Activating service name='org.a11y.atspi.Registry' requested by ':1.0' (uid=132 pid=1246 comm="/nix/store/5anzkdq6src76c4lm4m98w2a8f3j2cc4-gnom e-" label="kernel") Aug 22 19:34:16 kaiser at-spi-bus-launcher[1341]: dbus-daemon[1345]: Successfully activated service 'org.a11y.atspi.Registry' Aug 22 19:34:16 kaiser at-spi-bus-launcher[1341]: SpiRegistry daemon is running with well-known name - org.a11y.atspi.Registry […] Aug 22 19:34:26 kaiser dbus-daemon[1775]: [session uid=1000 pid=1775] Activating via systemd: service name='org.a11y.Bus' unit='at-spi-dbus-bus.service' requested by ':1.10' (uid=1000 pid=1852 comm="/nix/store/0k7r7imgs4zw3c9csldq7clmcyn4cy6k-gnome-" label="kernel") Aug 22 19:34:26 kaiser systemd[1769]: Starting Accessibility services bus... Aug 22 19:34:26 kaiser at-spi-bus-laun[1858]: g_settings_schema_source_lookup: assertion 'source != NULL' failed Aug 22 19:34:26 kaiser at-spi-bus-laun[1858]: g_settings_schema_source_lookup: assertion 'source != NULL' failed Aug 22 19:34:26 kaiser dbus-daemon[1775]: [session uid=1000 pid=1775] Successfully activated service 'org.a11y.Bus' Aug 22 19:34:26 kaiser systemd[1769]: Started Accessibility services bus. Aug 22 19:34:26 kaiser at-spi-bus-launcher[1858]: dbus-daemon[1862]: Activating service name='org.a11y.atspi.Registry' requested by ':1.0' (uid=1000 pid=1852 comm="/nix/store/0k7r7imgs4zw3c9csldq7clmcyn4cy6k-gnome-" label="kernel") Aug 22 19:34:26 kaiser at-spi-bus-launcher[1858]: dbus-daemon[1862]: Successfully activated service 'org.a11y.atspi.Registry' Aug 22 19:34:26 kaiser at-spi-bus-launcher[1858]: SpiRegistry daemon is running with well-known name - org.a11y.atspi.Registry This patch starts wrapping the binary, fixing one of the stragglers from https://github.com/NixOS/nixpkgs/issues/14120. Unfortunately, we could not use wrapGAppsHook due to dependency cycle.
Diffstat (limited to 'pkgs/development/libraries/at-spi2-core')
| -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 644d4e29c30..21649d1728c 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; |