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

Merge pull request #85169 from prusnak/inkscape

Browse Source 
inkscape: 0.92.5 -> 1.0
This commit is contained in:
Michael Raskin
2020-07-20 08:45:05 +00:00
committed by GitHub
parent a8546a078d 8402a74cce
commit 23c93a5205
23 changed files with 228 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/fim/default.nix
View File

@@ -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

6
pkgs/tools/typesetting/tex/dblatex/default.nix
View File

@@ -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' \