Jan Tojnar 2020-02-27 16:56:24 +01:00
parent 14474ff8b5
commit 6c14807333
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 5 additions and 7 deletions

View File

@ -50,13 +50,13 @@ let
inherit (python2Packages) pygtk wrapPython python; inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gimp"; pname = "gimp";
version = "2.10.16"; version = "2.10.18";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb"; sha256 = "Zb/hEejuv/093jAWzLUH+ZSNJmPZSXy0ONm7YJ4R1xY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -1,13 +1,11 @@
diff --git a/app/gimp-version.c b/app/gimp-version.c 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 --- a/app/gimp-version.c
+++ b/app/gimp-version.c +++ b/app/gimp-version.c
@@ -228,9 +228,9 @@ @@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose,
"# Libraries #\n%s",
GIMP_GIT_VERSION,
GIMP_BUILD_ID, GIMP_BUILD_ID,
gimp_version_get_revision (), gimp_version_get_revision (),
GIMP_BUILD_PLATFORM, GIMP_BUILD_PLATFORM_FAMILY,
- CC_VERSION, - CC_VERSION,
+ "@cc_version@", + "@cc_version@",
lib_versions); lib_versions);