Merge pull request #85812 from jtojnar/gegl-timeout

2020-04-22 23:23:39 +02:00 · 2020-04-22 23:23:39 +02:00 · c52cc1953c
commit c52cc1953c
parent 1dcf798dae a2bdcd794b
2 changed files with 7 additions and 12 deletions
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@ -46,8 +46,13 @@ stdenv.mkDerivation rec {
  };

  patches = [
-    # Remove gegl:simple / backend-file test that times out frequently
-    ./patches/no-simple-backend-file-test.patch
+    # Prevent deadlock making tests time-out
+    # https://gitlab.gnome.org/GNOME/gegl/issues/226
+    # https://gitlab.gnome.org/GNOME/glib/issues/1941
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch";
+      sha256 = "8PlUcLQkuskjDGCA2obUPDW3jE++A6B5YWVgvn+GFrU=";
+    })
  ];

  nativeBuildInputs = [
--- a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
+++ b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch
@ -1,10 +0,0 @@
-diff --git a/tests/simple/meson.build b/tests/simple/meson.build
-index 2c735d80a..ae4d50f2a 100644
--- a/tests/simple/meson.build
-+++ b/tests/simple/meson.build
-@@ -1,5 +1,4 @@
- testnames = [
-  'backend-file',
-   'buffer-cast',
-   'buffer-changes',
-   'buffer-extract',