diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-07-05 18:52:59 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-09-17 10:32:16 +0200 |
| commit | 1c6d1907ac7284da2d371f05973cccf812dbdb02 (patch) | |
| tree | dcbb851a71bfc5b88f6251f3a32b95787a92f712 /pkgs/development/libraries/gegl | |
| parent | 204057ee53cf3616864e5a5cc0e4fa73abc5f2a6 (diff) | |
| download | nixpkgs-1c6d1907ac7284da2d371f05973cccf812dbdb02.tar nixpkgs-1c6d1907ac7284da2d371f05973cccf812dbdb02.tar.gz nixpkgs-1c6d1907ac7284da2d371f05973cccf812dbdb02.tar.bz2 nixpkgs-1c6d1907ac7284da2d371f05973cccf812dbdb02.tar.lz nixpkgs-1c6d1907ac7284da2d371f05973cccf812dbdb02.tar.xz nixpkgs-1c6d1907ac7284da2d371f05973cccf812dbdb02.tar.zst nixpkgs-1c6d1907ac7284da2d371f05973cccf812dbdb02.zip | |
gegl: 0.4.44 → 0.4.46
https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_44...GEGL_0_4_46
Diffstat (limited to 'pkgs/development/libraries/gegl')
| -rw-r--r-- | pkgs/development/libraries/gegl/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index bd4aea3210f..914d72a7fe8 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch2 , pkg-config , vala , gobject-introspection @@ -37,16 +38,25 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.44"; + version = "0.4.46"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "CkzbQWNeQGoISc0NPwPK99l8q4qhPShwfVMtAInVYSY="; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/gegl-${version}.tar.xz"; + hash = "sha256-0LOySBvId0xfPQpIdhGRAWbRju+COoWfuR54Grex6JI="; }; + patches = [ + # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/136 + # Fix missing libm dependency. + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gegl/-/commit/ee970f10f4fe442cbf8a4f5cb94049deab33e786.patch"; + hash = "sha256-0LLKH+Gg+1H83kN7hJGK2u+oLrw7Hxed7R4tTwT3C5s="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext @@ -104,10 +114,6 @@ stdenv.mkDerivation rec { "-Djasper=disabled" ]; - # TODO: Fix missing math symbols in gegl seamless clone. - # It only appears when we use packaged poly2tri-c instead of vendored one. - env.NIX_CFLAGS_COMPILE = "-lm"; - postPatch = '' chmod +x tests/opencl/opencl_test.sh patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh |