diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
| commit | 2d382f3d981fc9e4a350badb43736c252415d27c (patch) | |
| tree | 3d5f7a96aa71be52c86f3c243b23424e319cc286 /pkgs/tools/typesetting | |
| parent | 365379857fb561df949fc841e80458e317a1d682 (diff) | |
| parent | 2661511cdb39bd7612dd5311b46420785fc1eac8 (diff) | |
| download | nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.gz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.bz2 nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.lz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.xz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.zst nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/asciidoc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/dblatex/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 7c393c524151..e623f67e64bc 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -223,7 +223,7 @@ stdenv.mkDerivation rec { sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \ -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \ - -e "s|run('convert|run('${imagemagick}/bin/convert|g" \ + -e "s|run('convert|run('${imagemagick.out}/bin/convert|g" \ -i "filters/music/music2png.py" sed -e 's|filter="source-highlight|filter="${sourceHighlight}/bin/source-highlight|' \ diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 0aab900f1503..a7bc527042e4 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { -e 's|cmd = "inkscape|cmd = "${inkscape}/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}/bin/convert|g' \ + -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ -i "$file" done ''; |