aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/gdk-pixbuf
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-01-08 15:36:39 +0100
committerVladimír Čunát <v@cunat.cz>2020-01-08 15:36:39 +0100
commit754d02df72989cb0c3f3cbdd77390b550378d6b9 (patch)
treec566b988a6c768eb398efb05534f89dc42ba78b9 /pkgs/development/libraries/gdk-pixbuf
parent5194608599c756cf9d81739506f602b50595f7fd (diff)
gdk-pixbuf: upstream patch to fix the nixos test
Tested nixos.tests.installed-tests.gdk-pixbuf.x86_64-linux atop the current nixpkgs master.
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf')
-rw-r--r--pkgs/development/libraries/gdk-pixbuf/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 9c2da3c5b695..0ecbb35c1670 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,6 +1,8 @@
{ stdenv, fetchurl, nixosTests, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, gobject-introspection, doCheck ? false, makeWrapper }:
+, gobject-introspection, doCheck ? false, makeWrapper
+, fetchpatch
+}:
let
pname = "gdk-pixbuf";
@@ -16,6 +18,12 @@ in stdenv.mkDerivation rec {
patches = [
# Move installed tests to a separate output
./installed-tests-path.patch
+ # Temporary until the fix is released.
+ (fetchpatch {
+ name = "tests-circular-table.patch";
+ url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/59.diff";
+ sha256 = "0kaflac3mrh6031hwxk7j9fhli775hc503818h8zfl6b28zyn93f";
+ })
];
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];