diff options
| author | Jake Waksbaum <jake.waksbaum@gmail.com> | 2017-02-07 03:01:33 -0500 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-02-07 09:01:33 +0100 |
| commit | 651d5019bc31055788818287d3264c55d6a03be3 (patch) | |
| tree | aa2e94ba0dd98e0bf756a275a77cdff2eb651910 | |
| parent | cd10e3c4ffa3d6c729aab8778bf6027415025c44 (diff) | |
| download | nixlib-651d5019bc31055788818287d3264c55d6a03be3.tar nixlib-651d5019bc31055788818287d3264c55d6a03be3.tar.gz nixlib-651d5019bc31055788818287d3264c55d6a03be3.tar.bz2 nixlib-651d5019bc31055788818287d3264c55d6a03be3.tar.lz nixlib-651d5019bc31055788818287d3264c55d6a03be3.tar.xz nixlib-651d5019bc31055788818287d3264c55d6a03be3.tar.zst nixlib-651d5019bc31055788818287d3264c55d6a03be3.zip | |
pstoedit,plotutils: fix for darwin and mark not broken (#22196)
pstoedit,plotutils: fix for darwin
| -rw-r--r-- | pkgs/tools/graphics/plotutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/pstoedit/default.nix | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index c6bde4c5b0c3..219bfdf8c14d 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 93fc901aacfd..170dfdac2b6b 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, darwin, lib , zlib, ghostscript, imagemagick, plotutils, gd -, libjpeg, libwebp +, libjpeg, libwebp, libiconv }: stdenv.mkDerivation rec { @@ -13,13 +13,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]; + buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + libiconv ApplicationServices + ]); meta = with stdenv.lib; { description = "Translates PostScript and PDF graphics into other vector formats"; homepage = https://sourceforge.net/projects/pstoedit/; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |