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/applications/graphics/ImageMagick/default.nix | |
parent | 4c646dd6cb608a8e9f7d9f70dddb85fd4b076543 (diff) |
imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick/default.nix')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 9b17fbde7f5f8..e73cc9024c61c 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 ]; }; } |