diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-18 09:17:31 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-18 09:17:31 +0100 |
| commit | b3f764428f87ad2b4b3fb32de350a404272ce40e (patch) | |
| tree | 6acf184851295c6a44a2adfcda132d7c797608d5 | |
| parent | de5a233a71213101ccb3e06bad6a33d088f9e7f9 (diff) | |
| parent | fbc147494c7575cd1bcfb17d604adc7b61615bfd (diff) | |
| download | nixlib-b3f764428f87ad2b4b3fb32de350a404272ce40e.tar nixlib-b3f764428f87ad2b4b3fb32de350a404272ce40e.tar.gz nixlib-b3f764428f87ad2b4b3fb32de350a404272ce40e.tar.bz2 nixlib-b3f764428f87ad2b4b3fb32de350a404272ce40e.tar.lz nixlib-b3f764428f87ad2b4b3fb32de350a404272ce40e.tar.xz nixlib-b3f764428f87ad2b4b3fb32de350a404272ce40e.tar.zst nixlib-b3f764428f87ad2b4b3fb32de350a404272ce40e.zip | |
Merge pull request #13050 from bendlas/fix-inkscape
inkscape: add numpy to runtime path
| -rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 409fd0a767ce..3704ea2f9c41 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge +, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, unzip , boxMakerPlugin ? false # boxmaker plugin }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. - python pyxml lxml + python pyxml numpy lxml ]; buildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"* do wrapProgram "$i" --prefix PYTHONPATH : \ - "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" \ + "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})" \ --prefix PATH : ${python}/bin || \ exit 2 done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8bbccaf53cb..38d8bf296423 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12437,7 +12437,7 @@ let inferno = callPackage_i686 ../applications/inferno { }; inkscape = callPackage ../applications/graphics/inkscape { - inherit (pythonPackages) lxml; + inherit (pythonPackages) python pyxml lxml numpy; lcms = lcms2; }; |