diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-05 00:44:17 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:33:57 +0100 |
commit | b9d77e9f518cb2986c093ee53250ec284d855c8a (patch) | |
tree | 49ec5f3e3639a7df12d8b613990c1ee87c2d4a30 /pkgs/development/libraries/gdk-pixbuf | |
parent | f6c9a6729e6b57cb00c3781ddb83f3a1fc4c6ba5 (diff) |
gdk_pixbuf: 2.36.12 → 2.38.0
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf')
-rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/default.nix | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 9fece4cb7a549..85a65aea5620a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,25 +1,16 @@ -{ stdenv, fetchurl, fetchFromGitLab, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 , jasper, gobjectIntrospection, doCheck ? false, makeWrapper }: let pname = "gdk-pixbuf"; - version = "2.36.12"; -in -stdenv.mkDerivation rec { + version = "2.38.0"; +in stdenv.mkDerivation rec { name = "${pname}-${version}"; - # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball - # src = fetchurl { - # url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - # sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z"; - # }; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gdk-pixbuf"; - rev = version; - sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x"; }; patches = [ @@ -28,21 +19,13 @@ stdenv.mkDerivation rec { # For now, we are patching the build script to avoid the dependency. ./no-mime-sniffing.patch - # Fix installed tests with meson - # https://bugzilla.gnome.org/show_bug.cgi?id=795527 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371381; - sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn"; - }) + # Move installed tests to a separate output + ./installed-tests-path.patch - # Add missing test file bug753605-atsize.jpg (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch; - sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0"; + url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch; + sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92"; }) - - # Move installed tests to a separate output - ./installed-tests-path.patch ]; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; @@ -99,6 +82,10 @@ stdenv.mkDerivation rec { done ''; + preInstall = '' + PATH=$PATH:$out/bin # for install script + ''; + # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; |