forked from mirrors/nixpkgs
gimp: get rid of compiler from the runtime closure
This commit is contained in:
parent
fee991333d
commit
d3cfda14fb
|
@ -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
pkgs/applications/graphics/gimp/remove-cc-reference.patch
Normal file
13
pkgs/applications/graphics/gimp/remove-cc-reference.patch
Normal file
|
@ -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);
|
||||
|
Loading…
Reference in a new issue