From 0721cd2f7dce15a3a4289c9e0fa2786636b786e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Sep 2016 23:19:01 +0200
Subject: [PATCH] gimp: do not use top-level python packages

---
 pkgs/applications/graphics/gimp/2.8.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 662e214ceaf..4b380ed1886 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,9 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
+, pythonPackages, libart_lgpl, libexif, gettext, xorg }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (pythonPackages) pygtk wrapPython python;
+in stdenv.mkDerivation rec {
   name = "gimp-${version}";
   version = "2.8.18";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 250325f96c1..26b1bd6578c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13497,7 +13497,6 @@ in
     inherit (gnome2) libart_lgpl;
     webkit = null;
     lcms = lcms2;
-    wrapPython = pythonPackages.wrapPython;
   };
 
   gimp = gimp_2_8;