Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fee991333d1b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3cfda14fb63
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 7, 2018

  1. gimp: get rid of compiler from the runtime closure

    @pbogdan @globin
    pbogdan authored and globin committed Nov 7, 2018
    Copy the full SHA
    d3cfda1 View commit details
Showing with 23 additions and 1 deletion.
  1. +10 −1 pkgs/applications/graphics/gimp/default.nix
  2. +13 −0 pkgs/applications/graphics/gimp/remove-cc-reference.patch
11 changes: 10 additions & 1 deletion pkgs/applications/graphics/gimp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
{ stdenv, fetchurl, substituteAll, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@@ -36,6 +36,15 @@ in stdenv.mkDerivation rec {
export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES"
'';

patches = [
# to remove compiler from the runtime closure, reference was retained via
# gimp --version --verbose output
(substituteAll {
src = ./remove-cc-reference.patch;
cc_version = stdenv.cc.cc.name;
})
];

postFixup = ''
wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/
wrapProgram $out/bin/gimp-${stdenv.lib.versions.majorMinor version} \
13 changes: 13 additions & 0 deletions pkgs/applications/graphics/gimp/remove-cc-reference.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/app/gimp-version.c b/app/gimp-version.c
index 12605c6..a9083da 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@",
lib_versions);
g_free (lib_versions);