diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-22 23:01:31 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-22 23:01:31 +0200 |
| commit | a2bdcd794b4983f68e59dd5a77de65e4011e5ab1 (patch) | |
| tree | 7e14918d3aea7a239e741d97d56d7e3d968a9272 /pkgs/development/libraries/gegl | |
| parent | e391c83f0fe383006c0172105166326b3c453e13 (diff) | |
| download | nixpkgs-a2bdcd794b4983f68e59dd5a77de65e4011e5ab1.tar nixpkgs-a2bdcd794b4983f68e59dd5a77de65e4011e5ab1.tar.gz nixpkgs-a2bdcd794b4983f68e59dd5a77de65e4011e5ab1.tar.bz2 nixpkgs-a2bdcd794b4983f68e59dd5a77de65e4011e5ab1.tar.lz nixpkgs-a2bdcd794b4983f68e59dd5a77de65e4011e5ab1.tar.xz nixpkgs-a2bdcd794b4983f68e59dd5a77de65e4011e5ab1.tar.zst nixpkgs-a2bdcd794b4983f68e59dd5a77de65e4011e5ab1.zip | |
gegl_0_4: try to fix tests timing out
Diffstat (limited to 'pkgs/development/libraries/gegl')
| -rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 858596597b1..4810390ac1b 100644 --- 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 = [ diff --git a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch deleted file mode 100644 index bf07572182b..00000000000 --- a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch +++ /dev/null @@ -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', |