libhandy: 1.0.0 -> 1.0.1, reenable checks

This commit is contained in:
Markus S. Wamser 2020-11-04 01:07:10 +01:00
parent 4148fc489b
commit 3f857b887d

View File

@ -17,18 +17,20 @@
, gdk-pixbuf , gdk-pixbuf
, librsvg , librsvg
, hicolor-icon-theme , hicolor-icon-theme
, at-spi2-atk
, at-spi2-core
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libhandy"; pname = "libhandy";
version = "1.0.0"; version = "1.0.1";
outputs = [ "out" "dev" "devdoc" "glade" ]; outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk="; sha256 = "106qa4d2rcbvd3g3avbgkd59aq0bjvwpx8vfz1cikvwrarnfvql4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -52,8 +54,11 @@ stdenv.mkDerivation rec {
checkInputs = [ checkInputs = [
dbus dbus
hicolor-icon-theme
xvfb_run xvfb_run
at-spi2-atk
at-spi2-core
librsvg
hicolor-icon-theme
]; ];
mesonFlags = [ mesonFlags = [
@ -64,14 +69,11 @@ stdenv.mkDerivation rec {
PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
# Bail out! dbind-FATAL-WARNING: doCheck = true;
# 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;
checkPhase = '' checkPhase = ''
NO_AT_BRIDGE=1 \ 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" \ 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 \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \