From 7ff1544981651b3e160a007884201ce7b914f335 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Sep 2016 22:31:25 +0200
Subject: [PATCH] inkscape: use python.withPackages instead of wrappers

---
 .../applications/graphics/inkscape/default.nix | 18 +++++-------------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 36995f0bcc8b..ce8a22fd90f8 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
-, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
+, gsl, python, poppler, imagemagick, libwpg, librevenge
 , libvisio, libcdr, libexif, unzip, automake114x, autoconf
 , boxMakerPlugin ? false # boxmaker plugin
 }:
 
 let 
+  pythonEnv = python.withPackages(ps: with ps; [ pyxml numpy lxml ]);
 
 boxmaker = fetchurl {
   # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403
@@ -42,11 +43,9 @@ stdenv.mkDerivation rec {
       --replace "#if __cplusplus >= 201103L" "#if true"
   '';
 
-  propagatedBuildInputs = [
-    # Python is used at run-time to execute scripts, e.g., those from
-    # the "Effects" menu.
-    python pyxml numpy lxml
-  ];
+  # Python is used at run-time to execute scripts, e.g., those from
+  # the "Effects" menu.
+  propagatedBuildInputs = [ pythonEnv ];
 
   buildInputs = [
     pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
@@ -71,13 +70,6 @@ stdenv.mkDerivation rec {
     }
 
     # Make sure PyXML modules can be found at run-time.
-    for i in "$out/bin/"*
-    do
-      wrapProgram "$i" --prefix PYTHONPATH :      \
-       "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})"  \
-       --prefix PATH : ${python}/bin ||  \
-        exit 2
-    done
     rm "$out/share/icons/hicolor/icon-theme.cache"
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 404965ccf52b..fa0f03913b3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13847,7 +13847,6 @@ in
   inginious = callPackage ../servers/inginious {};
 
   inkscape = callPackage ../applications/graphics/inkscape {
-    inherit (pythonPackages) python pyxml lxml numpy;
     lcms = lcms2;
   };