diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-25 22:31:25 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-25 22:31:25 +0200 |
commit | 7ff1544981651b3e160a007884201ce7b914f335 (patch) | |
tree | 98f7462194e21ff6c5e648ed65c172d0e303c550 /pkgs/applications/graphics/inkscape/default.nix | |
parent | a441efcccce769f39714ca008ee1e77682ae43a2 (diff) | |
download | nixpkgs-7ff1544981651b3e160a007884201ce7b914f335.tar nixpkgs-7ff1544981651b3e160a007884201ce7b914f335.tar.gz nixpkgs-7ff1544981651b3e160a007884201ce7b914f335.tar.bz2 nixpkgs-7ff1544981651b3e160a007884201ce7b914f335.tar.lz nixpkgs-7ff1544981651b3e160a007884201ce7b914f335.tar.xz nixpkgs-7ff1544981651b3e160a007884201ce7b914f335.tar.zst nixpkgs-7ff1544981651b3e160a007884201ce7b914f335.zip |
inkscape: use python.withPackages instead of wrappers
Diffstat (limited to 'pkgs/applications/graphics/inkscape/default.nix')
-rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 36995f0bcc8..ce8a22fd90f 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" ''; |