summary refs log tree commit diff
path: root/pkgs/development/libraries/gegl
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-03-15 22:58:07 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-03-15 23:08:40 +0100
commitf63098a9c52fe7e93dba3af880e8fe714d86935c (patch)
treeed65e51f57ee0ea1d294b5c4bc683195be2027a6 /pkgs/development/libraries/gegl
parent8989d8f457875bbf62c12cdbde8a8658c1e26a4b (diff)
downloadnixpkgs-f63098a9c52fe7e93dba3af880e8fe714d86935c.tar
nixpkgs-f63098a9c52fe7e93dba3af880e8fe714d86935c.tar.gz
nixpkgs-f63098a9c52fe7e93dba3af880e8fe714d86935c.tar.bz2
nixpkgs-f63098a9c52fe7e93dba3af880e8fe714d86935c.tar.lz
nixpkgs-f63098a9c52fe7e93dba3af880e8fe714d86935c.tar.xz
nixpkgs-f63098a9c52fe7e93dba3af880e8fe714d86935c.tar.zst
nixpkgs-f63098a9c52fe7e93dba3af880e8fe714d86935c.zip
gegl_0_4: 0.4.26 → 0.4.28
NEWS: https://gitlab.gnome.org/GNOME/gegl/-/commit/91ace253930a83874f30a1d13e0ea5bbc2e5174c
Changes: https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_26...GEGL_0_4_28

- New dependency maxflow.
- dot path has been briefly hardcoded added (https://gitlab.gnome.org/GNOME/gegl/-/commit/5ac40e3c3f9ab25b1208a96a8fdcae6fd72958ef) but then it was switched back to finding it on PATH (https://gitlab.gnome.org/GNOME/gegl/-/commit/1f50456de59c686941a861d299a63bfcd4126ee5). Given that it is optional dependency only needed for debugging and graphviz is big, I have decided not to hardcode it in a patch.
Diffstat (limited to 'pkgs/development/libraries/gegl')
-rw-r--r--pkgs/development/libraries/gegl/4.0.nix20
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index af3c9d84ac7..2093328f579 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -1,11 +1,10 @@
 { lib, stdenv
 , fetchurl
-, fetchpatch
 , pkg-config
 , vala
 , gobject-introspection
 , gtk-doc
-, docbook_xsl
+, docbook-xsl-nons
 , docbook_xml_dtd_43
 , glib
 , babl
@@ -15,6 +14,7 @@
 , librsvg
 , lensfun
 , libspiro
+, maxflow
 , netsurf
 , pango
 , poly2tri-c
@@ -35,25 +35,16 @@
 
 stdenv.mkDerivation rec {
   pname = "gegl";
-  version = "0.4.26";
+  version = "0.4.28";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
+    sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA=";
   };
 
-  patches = [
-    # fix build with darwin: https://github.com/NixOS/nixpkgs/issues/99108
-    # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch";
-      sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
     gettext
@@ -62,7 +53,7 @@ stdenv.mkDerivation rec {
     vala
     gobject-introspection
     gtk-doc
-    docbook_xsl
+    docbook-xsl-nons
     docbook_xml_dtd_43
   ];
 
@@ -73,6 +64,7 @@ stdenv.mkDerivation rec {
     librsvg
     lensfun
     libspiro
+    maxflow
     netsurf.libnsgif
     pango
     poly2tri-c