mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
gimp: 2.10.14 → 2.10.16
https://gitlab.gnome.org/GNOME/gimp/blob/GIMP_2_10_16/NEWS#L11-211
This commit is contained in:
parent
abacc68138
commit
75132e6eb5
@ -50,13 +50,13 @@ let
|
||||
inherit (python2Packages) pygtk wrapPython python;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gimp";
|
||||
version = "2.10.14";
|
||||
version = "2.10.16";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz";
|
||||
sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -155,6 +155,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
"--without-webkit" # old version is required
|
||||
"--disable-check-update"
|
||||
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
|
||||
"--with-icc-directory=/run/current-system/sw/share/color/icc"
|
||||
# fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
|
||||
|
@ -1,13 +1,15 @@
|
||||
diff --git a/app/gimp-version.c b/app/gimp-version.c
|
||||
index 12605c6..a9083da 100644
|
||||
index 0f7bfb9bf9..1679624b8e 100644
|
||||
--- a/app/gimp-version.c
|
||||
+++ b/app/gimp-version.c
|
||||
@@ -203,7 +203,7 @@ gimp_version (gboolean be_verbose,
|
||||
lib_versions = gimp_library_versions (localized);
|
||||
verbose_info = g_strdup_printf ("git-describe: %s\n"
|
||||
"C compiler:\n%s\n%s",
|
||||
- GIMP_GIT_VERSION, CC_VERSION,
|
||||
+ GIMP_GIT_VERSION, "@cc_version@",
|
||||
@@ -228,9 +228,9 @@
|
||||
"# Libraries #\n%s",
|
||||
GIMP_GIT_VERSION,
|
||||
GIMP_BUILD_ID,
|
||||
gimp_version_get_revision (),
|
||||
GIMP_BUILD_PLATFORM,
|
||||
- CC_VERSION,
|
||||
+ "@cc_version@",
|
||||
lib_versions);
|
||||
g_free (lib_versions);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user