diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-07-20 08:45:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 08:45:05 +0000 |
| commit | 23c93a5205fd98ac9cdb8eabbbd2c2c9bc9a324e (patch) | |
| tree | c6918251d1a149ff6c3c0ebd400968b4cc5c7458 /pkgs/tools | |
| parent | a8546a078df91b2fa3a37395698a7224e35408bb (diff) | |
| parent | 8402a74cce2216de0fd2cce4e5fd897e5dedd450 (diff) | |
Merge pull request #85169 from prusnak/inkscape
inkscape: 0.92.5 -> 1.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/fim/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/dblatex/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 6a3d9a29db37..dd2dcc1f5bf1 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -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 diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 1f6939e1b11c..5fde58251e02 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -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' \ |