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 | |
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.
11 files changed, 24 insertions, 18 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 0fe8d1a89cf..b4b5a6fdc07 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -43,7 +43,7 @@ let # Paths to external programs. $wgDiff3 = "${pkgs.diffutils}/bin/diff3"; $wgDiff = "${pkgs.diffutils}/bin/diff"; - $wgImageMagickConvertCommand = "${pkgs.imagemagick}/bin/convert"; + $wgImageMagickConvertCommand = "${pkgs.imagemagick.out}/bin/convert"; #$wgDebugLogFile = "/tmp/mediawiki_debug_log.txt"; diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 850041ccfc7..b4fb8d1937d 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i "w3m.el" \ -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ; - s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g' + s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g' sed -i "w3m-image.el" \ - -e 's|(w3m-which-command "convert")|"${imagemagick}/bin/convert"|g ; - s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g' + -e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ; + s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g' ''; configureFlags = [ diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 9b17fbde7f5..e73cc9024c6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { patches = [ ./imagetragick.patch ] ++ cfg.patches; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "doc" ]; # bin/ isn't really big + outputMan = "out"; # it's tiny enableParallelBuilding = true; @@ -76,18 +77,23 @@ stdenv.mkDerivation rec { ; postInstall = '' - - (cd "$out/include" && ln -s ImageMagick* ImageMagick) + (cd "$dev/include" && ln -s ImageMagick* ImageMagick) + moveToOutput "bin/*-config" "$dev" + moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params + for file in "$dev"/bin/*-config; do + substituteInPlace "$file" --replace pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do - sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la + sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la done ''; meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ the-kenny wkennington ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 46f4e8635a9..83b782e65d6 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR/fakehome export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler export POPPLER_LIB_DIR=${poppler_utils.out}/lib - export MAGICK_INC=${imagemagick}/include/ImageMagick - export MAGICK_LIB=${imagemagick}/lib + export MAGICK_INC=${imagemagick.dev}/include/ImageMagick + export MAGICK_LIB=${imagemagick.out}/lib export FC_INC_DIR=${fontconfig.dev}/include/fontconfig export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo}/include/podofo diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 4a5522039c8..41a1ea3c3e7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; passthru = { - wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick}/bin"; + wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick.out}/bin"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index ecf08a529d1..ce4517fe86a 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e "s|dirname|${coreutils}/bin/dirname|" lock sed -i -e "s|rm |${coreutils}/bin/rm |" lock sed -i -e "s|scrot |${scrot}/bin/scrot |" lock - sed -i -e "s|convert |${imagemagick}/bin/convert |" lock + sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock sed -i -e "s|awk |${gawk}/bin/awk|" lock sed -i -e "s|i3lock |${i3lock-color}/bin/i3lock-color |" lock ''; diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 606a4200d0e..73b987baeb0 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; - NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick"; + NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; meta = { diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index 656bb4aede0..bf1197c2bf2 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { cp -R . $out cp -R ${modulesSrc}/* $out/modules/ wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ + --prefix PATH ":" "${xawtv}/bin:${imagemagick.out}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \ --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" ''; 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 ''; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d70be1f9f81..422b3b6e7da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9779,7 +9779,7 @@ let self = _self // overrides; _self = with self; { buildInputs = [ pkgs.imagemagick ]; preConfigure = '' - sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL + sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL ''; doCheck = false; }; |