Unverified Commit 5d1b96eb authored by Nikolay Korotkiy's avatar Nikolay Korotkiy Committed by GitHub
Browse files

Merge pull request #290698 from 9p4/gegl-0.4.48 

gegl: 0.4.46 → 0.4.48
parents 94e3ac73 043c2547

pkgs/development/libraries/gegl/default.nix

+9 −19
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchpatch2

, pkg-config

, vala

, gi-docgen

, gobject-introspection

, gtk-doc

, docbook-xsl-nons

, docbook_xml_dtd_43

, glib

, babl

, libpng
@@ -38,25 +35,16 @@ 


stdenv.mkDerivation rec {

  pname = "gegl";

  version = "0.4.46";

  version = "0.4.48";



  outputs = [ "out" "dev" "devdoc" ];

  outputBin = "dev";



  src = fetchurl {

    url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/gegl-${version}.tar.xz";

    hash = "sha256-0LOySBvId0xfPQpIdhGRAWbRju+COoWfuR54Grex6JI=";

    hash = "sha256-QYwm2UvogF19mPbeDGglyia9dPystsGI2kdTPZ7igkc=";

  };



  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
@@ -64,9 +52,7 @@ stdenv.mkDerivation rec { 
    ninja

    vala

    gobject-introspection

    gtk-doc

    docbook-xsl-nons

    docbook_xml_dtd_43

    gi-docgen

  ];



  buildInputs = [
@@ -102,7 +88,6 @@ stdenv.mkDerivation rec { 
  ];



  mesonFlags = [

    "-Dgtk-doc=true"

    "-Dmrg=disabled" # not sure what that is

    "-Dsdl2=disabled"

    "-Dpygobject=disabled"
@@ -119,6 +104,11 @@ stdenv.mkDerivation rec { 
    patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh

  '';



  postFixup = ''

    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.

    moveToOutput "share/doc" "$devdoc"

  '';



  # tests fail to connect to the com.apple.fonts daemon in sandboxed mode

  doCheck = !stdenv.isDarwin;