aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix76
1 files changed, 54 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
index 82fbbc967ef..08b8f70b2d9 100644
--- a/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,23 +1,43 @@
-{ stdenv, fetchurl, nixosTests, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
-, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, gobject-introspection, doCheck ? false, makeWrapper
+{ stdenv
+, fetchurl
+, nixosTests
+, fixDarwinDylibNames
+, meson
+, ninja
+, pkg-config
+, gettext
+, python3
+, libxml2
+, libxslt
+, docbook-xsl-nons
+, docbook_xml_dtd_43
+, gtk-doc
+, glib
+, libtiff
+, libjpeg
+, libpng
+, gnome3
+, gobject-introspection
+, doCheck ? false
+, makeWrapper
, fetchpatch
}:
-let
+stdenv.mkDerivation rec {
pname = "gdk-pixbuf";
version = "2.40.0";
-in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm";
};
patches = [
# Move installed tests to a separate output
./installed-tests-path.patch
+
# Temporary until the fix is released.
(fetchpatch {
name = "tests-circular-table.patch";
@@ -26,24 +46,34 @@ in stdenv.mkDerivation rec {
})
];
- outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
-
- setupHook = ./setup-hook.sh;
-
- # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
- buildInputs = [ libX11 ];
-
nativeBuildInputs = [
- meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
- gtk-doc gobject-introspection makeWrapper glib
- ]
- ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ meson
+ ninja
+ pkg-config
+ gettext
+ python3
+ libxml2
+ libxslt
+ docbook-xsl-nons
+ docbook_xml_dtd_43
+ gtk-doc
+ gobject-introspection
+ makeWrapper
+ glib
+ ] ++ stdenv.lib.optional stdenv.isDarwin [
+ fixDarwinDylibNames
+ ];
- propagatedBuildInputs = [ glib libtiff libjpeg libpng ];
+ propagatedBuildInputs = [
+ glib
+ libtiff
+ libjpeg
+ libpng
+ ];
mesonFlags = [
"-Ddocs=true"
- "-Dx11=true"
+ "-Dx11=false" # use gdk-pixbuf-xlib
"-Dgir=${if gobject-introspection != null then "true" else "false"}"
"-Dgio_sniffing=false"
];
@@ -87,6 +117,8 @@ in stdenv.mkDerivation rec {
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
inherit doCheck;
+ setupHook = ./setup-hook.sh;
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
@@ -102,8 +134,8 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A library for image loading and manipulation";
- homepage = "http://library.gnome.org/devel/gdk-pixbuf/";
- maintainers = [ maintainers.eelco ];
+ homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf";
+ maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
license = licenses.lgpl21;
platforms = platforms.unix;
};