summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/graphics/gimp
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-02-27 16:56:24 +0100
committerJan Tojnar <jtojnar@gmail.com>2020-02-27 17:02:00 +0100
commit6c1480733323111754e9d33e270f3de2f6e56db7 (patch)
tree9a7b511e42282c8e1f35f53b0fa7969c07f37fa3 /pkgs/applications/graphics/gimp
parent14474ff8b5a12c9b78b673987a3adf9f71003e18 (diff)
gimp: 2.10.16 → 2.10.18
https://www.gimp.org/news/2020/02/24/gimp-2-10-18-released/ https://gitlab.gnome.org/GNOME/gimp/-/blob/GIMP_2_10_18/NEWS#L11-69
Diffstat (limited to 'pkgs/applications/graphics/gimp')
-rw-r--r--pkgs/applications/graphics/gimp/default.nix4
-rw-r--r--pkgs/applications/graphics/gimp/remove-cc-reference.patch8
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index e9223b1453e2..b5df3d768d29 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -50,13 +50,13 @@ let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
pname = "gimp";
- version = "2.10.16";
+ version = "2.10.18";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
- sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb";
+ sha256 = "Zb/hEejuv/093jAWzLUH+ZSNJmPZSXy0ONm7YJ4R1xY=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
index e37351cfd463..20c350bdaea1 100644
--- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch
+++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
@@ -1,13 +1,11 @@
diff --git a/app/gimp-version.c b/app/gimp-version.c
-index 0f7bfb9bf9..1679624b8e 100644
+index 3d1894a036..48bb670b64 100644
--- a/app/gimp-version.c
+++ b/app/gimp-version.c
-@@ -228,9 +228,9 @@
- "# Libraries #\n%s",
- GIMP_GIT_VERSION,
+@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose,
GIMP_BUILD_ID,
gimp_version_get_revision (),
- GIMP_BUILD_PLATFORM,
+ GIMP_BUILD_PLATFORM_FAMILY,
- CC_VERSION,
+ "@cc_version@",
lib_versions);