From 651d5019bc31055788818287d3264c55d6a03be3 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Tue, 7 Feb 2017 03:01:33 -0500 Subject: [PATCH] pstoedit,plotutils: fix for darwin and mark not broken (#22196) pstoedit,plotutils: fix for darwin --- pkgs/tools/graphics/plotutils/default.nix | 2 +- 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; }; }