public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13050 from bendlas/fix-inkscape

Browse Source 
inkscape: add numpy to runtime path
This commit is contained in:
Frederik Rietdijk 2016-02-18 09:17:31 +01:00
commit b3f764428f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , 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 , libvisio, libcdr, libexif, unzip
, boxMakerPlugin ? false # boxmaker plugin , boxMakerPlugin ? false # boxmaker plugin
}: }:
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from # Python is used at run-time to execute scripts, e.g., those from
# the "Effects" menu. # the "Effects" menu.
python pyxml lxml python pyxml numpy lxml
]; ];
buildInputs = [ buildInputs = [
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
for i in "$out/bin/"* for i in "$out/bin/"*
do do
wrapProgram "$i" --prefix PYTHONPATH : \ wrapProgram "$i" --prefix PYTHONPATH : \
"$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" \ "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})" \
--prefix PATH : ${python}/bin || \ --prefix PATH : ${python}/bin || \
exit 2 exit 2
done done

2
pkgs/top-level/all-packages.nix
View File

@ -12437,7 +12437,7 @@ let
inferno = callPackage_i686 ../applications/inferno { }; inferno = callPackage_i686 ../applications/inferno { };
inkscape = callPackage ../applications/graphics/inkscape { inkscape = callPackage ../applications/graphics/inkscape {
inherit (pythonPackages) lxml; inherit (pythonPackages) python pyxml lxml numpy;
lcms = lcms2; lcms = lcms2;
}; };