aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix24
1 files changed, 7 insertions, 17 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
index 08b8f70b2d9a..2d6fae915f8c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -20,30 +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 = [
@@ -60,9 +53,7 @@ stdenv.mkDerivation rec {
gobject-introspection
makeWrapper
glib
- ] ++ stdenv.lib.optional stdenv.isDarwin [
- fixDarwinDylibNames
- ];
+ ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
propagatedBuildInputs = [
glib
@@ -72,9 +63,8 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
- "-Ddocs=true"
- "-Dx11=false" # use gdk-pixbuf-xlib
- "-Dgir=${if gobject-introspection != null then "true" else "false"}"
+ "-Dgtk_doc=true"
+ "-Dintrospection=${if gobject-introspection != null then "enabled" else "disabled"}"
"-Dgio_sniffing=false"
];
@@ -136,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;
};
}