diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-21 20:20:29 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-21 20:21:48 -0400 |
commit | db4d77779c9b52a35c5a4306d36e2727cba1b162 (patch) | |
tree | 406873a406559b2417b1959f750c27cf56af4df3 /pkgs/applications/graphics | |
parent | 60a666507c1511ce48cf933ce6d4e8d727899d91 (diff) | |
parent | 0106dfcbeb56742503a89309c60a95433514226e (diff) | |
download | nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.gz nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.bz2 nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.lz nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.xz nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.tar.zst nixlib-db4d77779c9b52a35c5a4306d36e2727cba1b162.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/feh/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 4 |
3 files changed, 9 insertions, 31 deletions
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 96d4a397c909..eb7daf2797bf 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.26.1"; + version = "2.26.3"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd"; + sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 80bc2d49efce..f92594f08e16 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 @@ -9,37 +9,13 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.0"; + version = "2.10.2"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z"; + sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w"; }; - patches = [ - # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371482; - sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc"; - }) - - # fix absolute paths stored in configuration - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6; - sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris"; - }) - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df; - sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh"; - }) - - # fix pc file (needed e.g. for building plug-ins) - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe; - sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc buildInputs = [ @@ -80,6 +56,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--without-webkit" # old version is required + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/var/run/current-system/sw/share/color/icc" ]; doCheck = true; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index f86694ebc6cb..690253947a18 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "136nia6z8l9czk3ls2c9dpk617cvfilfhx0s838g5nrqxh4kn0cf"; + sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; |