diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 13:41:15 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 13:41:15 +0200 |
commit | 73f1f5eb3969743fe459e7cc36cfb766c7f5318a (patch) | |
tree | 3b55d851edb0ea73b65cb9ac5b53f5e13cd556dd /pkgs/tools/typesetting | |
parent | 4c646dd6cb608a8e9f7d9f70dddb85fd4b076543 (diff) | |
download | nixpkgs-73f1f5eb3969743fe459e7cc36cfb766c7f5318a.tar nixpkgs-73f1f5eb3969743fe459e7cc36cfb766c7f5318a.tar.gz nixpkgs-73f1f5eb3969743fe459e7cc36cfb766c7f5318a.tar.bz2 nixpkgs-73f1f5eb3969743fe459e7cc36cfb766c7f5318a.tar.lz nixpkgs-73f1f5eb3969743fe459e7cc36cfb766c7f5318a.tar.xz nixpkgs-73f1f5eb3969743fe459e7cc36cfb766c7f5318a.tar.zst nixpkgs-73f1f5eb3969743fe459e7cc36cfb766c7f5318a.zip |
imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
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 7c393c52415..e623f67e64b 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 0aab900f150..a7bc527042e 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 ''; |