diff options
| author | Markus S. Wamser <github-dev@mail2013.wamser.eu> | 2020-11-04 01:07:10 +0100 |
|---|---|---|
| committer | Markus S. Wamser <github-dev@mail2013.wamser.eu> | 2020-11-04 13:40:24 +0100 |
| commit | 3f857b887d9cdf35d2633d11ac20d6105a72db5b (patch) | |
| tree | e2bd130e95978bd60b1a1bb317fb133985a5d0be /pkgs/development/libraries/libhandy/default.nix | |
| parent | 4148fc489b29e826bd42ed05e12ba6fe64c2921e (diff) | |
libhandy: 1.0.0 -> 1.0.1, reenable checks
Diffstat (limited to 'pkgs/development/libraries/libhandy/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libhandy/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 835eaeac2bf4..a008052c0ca8 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -17,18 +17,20 @@ , gdk-pixbuf , librsvg , hicolor-icon-theme +, at-spi2-atk +, at-spi2-core }: stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.0.0"; + version = "1.0.1"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk="; + sha256 = "106qa4d2rcbvd3g3avbgkd59aq0bjvwpx8vfz1cikvwrarnfvql4"; }; nativeBuildInputs = [ @@ -52,8 +54,11 @@ stdenv.mkDerivation rec { checkInputs = [ dbus - hicolor-icon-theme xvfb_run + at-spi2-atk + at-spi2-core + librsvg + hicolor-icon-theme ]; mesonFlags = [ @@ -64,14 +69,11 @@ stdenv.mkDerivation rec { PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; - # Bail out! dbind-FATAL-WARNING: - # AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: - # The name org.a11y.Bus was not provided by any .service files - doCheck = false; + doCheck = true; checkPhase = '' NO_AT_BRIDGE=1 \ - XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" + XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ |