summary refs log tree commit diff
path: root/pkgs/development/libraries/gegl/4.0.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-12-29 21:29:34 +0000
committerAlyssa Ross <hi@alyssa.is>2019-12-29 21:29:34 +0000
commit1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (patch)
tree25f168400b9192ca94a7bdb0bb19ce11f03db509 /pkgs/development/libraries/gegl/4.0.nix
parent82bd3b0cbfb0af1555ed5b6b6f4edf2b6b17a144 (diff)
parentbe90b35b9efbd7baaa80f367ffc41609531a8fe2 (diff)
downloadnixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.gz
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.bz2
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.lz
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.xz
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.zst
nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.zip
Merge remote-tracking branch 'nixpkgs/master' into spectrum
Diffstat (limited to 'pkgs/development/libraries/gegl/4.0.nix')
-rw-r--r--pkgs/development/libraries/gegl/4.0.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index ca7163af49b..1bdf557f399 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch";
       sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d";
     })
+
+    # Fix test timeout. Downstream debian patch.
+    (fetchpatch {
+      url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch";
+      sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly";
+    })
   ];
 
   nativeBuildInputs = [