Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cc3d5f46e340
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc30c161ee12
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2020

  1. libhandy: 1.0.0 -> 1.0.1, reenable checks

    @wamserma
    wamserma committed Nov 4, 2020
    Copy the full SHA
    3f857b8 View commit details

  2. Merge pull request #102752 from wamserma/libhandy-101-staging 

    libhandy: 1.0.0 -> 1.0.1, reenable checks
    @worldofpeace
    worldofpeace authored Nov 4, 2020
    Copy the full SHA
    cc30c16 View commit details
Showing with 10 additions and 8 deletions.
  1. +10 −8 pkgs/development/libraries/libhandy/default.nix
18 changes: 10 additions & 8 deletions pkgs/development/libraries/libhandy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \