diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-21 13:08:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 13:08:02 +0100 |
| commit | 0c4755b420c2b7c2a9922f6e5beda48d58528bae (patch) | |
| tree | f21460904bf6372e352987854a8dbe7f694a9c57 /pkgs/applications | |
| parent | 41944946de3a9ddb9dbe7c091bf6bc1d92f9c34b (diff) | |
| parent | 75132e6eb54b826b4ecab37f2ecd0159c77e40d9 (diff) | |
| download | nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.gz nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.bz2 nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.lz nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.xz nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.zst nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.zip | |
Merge pull request #80715 from jtojnar/gimp-2.10.16
gimp: 2.10.14 → 2.10.16
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/gimp/remove-cc-reference.patch | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index d3950c06c339..e9223b1453e2 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.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) diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch index 0d6a87000ccd..e37351cfd463 100644 --- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -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); |