diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 6b38251a6806..c25f9145ea5e 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg"; + sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ="; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch"; - sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; + sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE="; }) ]; @@ -120,8 +120,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = "http://www.gegl.org"; - license = licenses.gpl3; + homepage = "https://www.gegl.org"; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 1b8643172177..a99ec05d771c 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,12 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk2, bzip2, intltool, libintl +{ stdenv +, fetchurl +, pkgconfig +, babl +, libpng +, cairo +, libjpeg +, librsvg +, pango +, gtk2 +, bzip2 +, intltool +, libintl , OpenGL ? null }: stdenv.mkDerivation rec { - name = "gegl-0.2.0"; + pname = "gegl"; + version = "0.2.0"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2"; + url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2"; sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; }; @@ -17,7 +29,7 @@ stdenv.mkDerivation rec { name = "CVE-2012-4433.patch"; })]; - # needs fonts otherwise don't know how to pass them + # needs fonts otherwise don't know how to pass them configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] @@ -27,10 +39,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails 3 out of 19 tests - meta = { + meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = "http://www.gegl.org"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.gegl.org"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; }