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

Merge pull request #59180 from jtojnar/gimp-2.10.10

Browse Source 
gimp: 2.10.8 → 2.10.10
This commit is contained in:
Jan Tojnar 2019-04-09 22:18:31 +02:00 committed by GitHub
commit 9002989bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/gimp/default.nix
View File

@ -8,12 +8,12 @@
let let
inherit (python2Packages) pygtk wrapPython python; inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "gimp-${version}"; pname = "gimp";
version = "2.10.8"; version = "2.10.10";
src = fetchurl { src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq"; sha256 = "0xwck5nbpb945s1cyij3kfqw1pchbhx8i5vf5hgywyjw4r1z5l8j";
}; };
nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ]; nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];

43
pkgs/development/libraries/gegl/4.0.nix
View File

@ -1,20 +1,45 @@
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which { stdenv, fetchurl, fetchpatch, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw , librsvg, pango, gtk, bzip2, json-glib, gettext, autoreconfHook, libraw
, gexiv2, libwebp, gnome3, libintl }: , gexiv2, libwebp, gnome3, libintl }:
let stdenv.mkDerivation rec {
version = "0.4.12"; pname = "gegl";
in stdenv.mkDerivation rec { version = "0.4.14";
name = "gegl-${version}";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9"; sha256 = "00crhngwi07f5b9x77kx5p7p4cl6l5g6glpz9rqv7pfqk62xa0ac";
}; };
patches = stdenv.lib.optionals stdenv.isDarwin [
# Make the Darwin patches below apply cleanly
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/141a7aa76cd36143f624f06b1c43d2483945653c.patch;
sha256 = "0ijv9ra6723jn60krjwzbc6l9qr08h76bsz9xgddvfgsgr1nnpbi";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/b3ff0df080d133bbdb394c3db40d4f9d2980a8a6.patch;
sha256 = "0im0rqk8mz9vi7qqx06vj4wm5hjwv1544jwdaaywlcrs9g266hl0";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/fe756be6f0c776a45201a61f67d3e5e42f6398de.patch;
sha256 = "0h3rqwfsph2gisbwvc2v5a9r5b0djcxlm790xpi6yfndj42b0v2b";
})
# Fix build on Darwin
# https://gitlab.gnome.org/GNOME/gegl/merge_requests/28
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/ac331b5c0e3d940b64bb811b0f54e86c7d312917.patch;
sha256 = "1yj9jh8q9cbr1szrxhdapknk4nfhbkbc1njv50ifrj7vyfislj34";
})
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gegl/commit/d05eb01170728f45f561ca937708a293e29e02d9.patch;
sha256 = "0gwz12sm8kkmzyxsiq0sl30cabs5q0ckj743yrzimspkhrvc1ya2";
})
];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;
@ -26,7 +51,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc
nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ]; nativeBuildInputs = [ pkgconfig gettext which autoreconfHook libintl ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Graph-based image processing framework"; description = "Graph-based image processing framework";