diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-11-20 00:16:51 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-11-20 01:33:02 +0100 |
| commit | 17eb317428304255695ea41200e70bd172b1892c (patch) | |
| tree | 30bbe270f5aa5813185b1a5e3d86863ce9593ac7 /pkgs/development/libraries/gdk-pixbuf | |
| parent | 854f78d1555e55d4f623b46b528d180a5c2a5008 (diff) | |
gdk-pixbuf: 2.40.0 → 2.42.0
https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.0.news
xlib has been dropped, some build flags changed: https://mail.gnome.org/archives/distributor-list/2020-November/msg00000.html
Also corrected license.
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf')
| -rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 9b2fd0b778bf..2d6fae915f8c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -20,31 +20,23 @@ , gobject-introspection , doCheck ? false , makeWrapper -, fetchpatch , lib }: stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.40.0"; + version = "2.42.0"; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"; + sha256 = "1ixfmmamgv67is7snzighfr7c9y2maq3q4a075xdq0d9s4w16i3k"; }; patches = [ # Move installed tests to a separate output ./installed-tests-path.patch - - # Temporary until the fix is released. - (fetchpatch { - name = "tests-circular-table.patch"; - url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/59.diff"; - sha256 = "0kaflac3mrh6031hwxk7j9fhli775hc503818h8zfl6b28zyn93f"; - }) ]; nativeBuildInputs = [ @@ -71,9 +63,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Ddocs=true" - "-Dx11=false" # use gdk-pixbuf-xlib - "-Dgir=${lib.boolToString (gobject-introspection != null)}" + "-Dgtk_doc=true" + "-Dintrospection=${if gobject-introspection != null then "enabled" else "disabled"}" "-Dgio_sniffing=false" ]; @@ -135,7 +126,7 @@ stdenv.mkDerivation rec { description = "A library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.unix; }; } |