public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104337 from jtojnar/gdk-pixbuf-2.42

Browse Source 
gdk-pixbuf: 2.40.0 → 2.42.0
This commit is contained in:
Jan Tojnar 2020-11-24 05:40:45 +01:00 committed by GitHub
commit 2e110ba5a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -20,31 +20,23 @@
, gobject-introspection , gobject-introspection
, doCheck ? false , doCheck ? false
, makeWrapper , makeWrapper
, fetchpatch
, lib , lib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gdk-pixbuf"; pname = "gdk-pixbuf";
version = "2.40.0"; version = "2.42.0";
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"; sha256 = "1ixfmmamgv67is7snzighfr7c9y2maq3q4a075xdq0d9s4w16i3k";
}; };
patches = [ patches = [
# Move installed tests to a separate output # Move installed tests to a separate output
./installed-tests-path.patch ./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 = [ nativeBuildInputs = [
@ -71,9 +63,8 @@ stdenv.mkDerivation rec {
]; ];
mesonFlags = [ mesonFlags = [
"-Ddocs=true" "-Dgtk_doc=true"
"-Dx11=false" # use gdk-pixbuf-xlib "-Dintrospection=${if gobject-introspection != null then "enabled" else "disabled"}"
"-Dgir=${lib.boolToString (gobject-introspection != null)}"
"-Dgio_sniffing=false" "-Dgio_sniffing=false"
]; ];
@ -135,7 +126,7 @@ stdenv.mkDerivation rec {
description = "A library for image loading and manipulation"; description = "A library for image loading and manipulation";
homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf";
maintainers = [ maintainers.eelco ] ++ teams.gnome.members; maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
license = licenses.lgpl21; license = licenses.lgpl21Plus;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }