treewide: replace inkscape with inkscape_0
The Inkscape CLI interface has been changed with 1.x and packages are not adjusted yet to this change. Let's use inkscape 0.x instead.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, autoconf, automake, pkgconfig
|
||||
, perl, flex, bison, readline, libexif
|
||||
, x11Support ? true, SDL
|
||||
, svgSupport ? true, inkscape
|
||||
, svgSupport ? true, inkscape_0
|
||||
, asciiArtSupport ? true, aalib
|
||||
, gifSupport ? true, giflib
|
||||
, tiffSupport ? true, libtiff
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = with stdenv.lib;
|
||||
[ perl flex bison readline libexif ]
|
||||
++ optional x11Support SDL
|
||||
++ optional svgSupport inkscape
|
||||
++ optional svgSupport inkscape_0
|
||||
++ optional asciiArtSupport aalib
|
||||
++ optional gifSupport giflib
|
||||
++ optional tiffSupport libtiff
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, python2, libxslt, texlive
|
||||
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null
|
||||
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape_0 ? null, fontconfig ? null, ghostscript ? null
|
||||
|
||||
, tex ? texlive.combine { # satisfy all packages that ./configure mentions
|
||||
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
|
||||
@@ -16,7 +16,7 @@
|
||||
assert enableAllFeatures ->
|
||||
imagemagick != null &&
|
||||
transfig != null &&
|
||||
inkscape != null &&
|
||||
inkscape_0 != null &&
|
||||
fontconfig != null &&
|
||||
ghostscript != null;
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
-e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
|
||||
-e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \
|
||||
-e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
|
||||
-e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \
|
||||
-e 's|cmd = "inkscape|cmd = "${inkscape_0}/bin/inkscape|g' \
|
||||
-e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \
|
||||
-e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
|
||||
-e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \
|
||||
|
||||
Reference in New Issue
Block a user