diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-04-20 08:37:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 08:37:19 +0200 |
| commit | d7d692778cd04b923a57503516c5246791bc7626 (patch) | |
| tree | 52681634d4ecc1bab080a1ed6e200898df038098 /pkgs/applications/misc | |
| parent | 1bba16fe1937b9fbc71ff54a1c4a57204cdcef59 (diff) | |
| parent | 48382349186e1ed8a502b40f69635d327fb00113 (diff) | |
| download | nixlib-d7d692778cd04b923a57503516c5246791bc7626.tar nixlib-d7d692778cd04b923a57503516c5246791bc7626.tar.gz nixlib-d7d692778cd04b923a57503516c5246791bc7626.tar.bz2 nixlib-d7d692778cd04b923a57503516c5246791bc7626.tar.lz nixlib-d7d692778cd04b923a57503516c5246791bc7626.tar.xz nixlib-d7d692778cd04b923a57503516c5246791bc7626.tar.zst nixlib-d7d692778cd04b923a57503516c5246791bc7626.zip | |
Merge pull request #39173 from knedlsepp/enable-xskat-darwin
Enable some imake builds on darwin
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/gv/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/applications/misc/oneko/default.nix | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 3fad634b18b7..b13e7ae5232c 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: +{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: let name = "gv-3.7.4"; @@ -11,7 +11,18 @@ stdenv.mkDerivation { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - buildInputs = [ Xaw3d ghostscriptX perl ]; + configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--enable-SIGCHLD-fallback" + ]; + + buildInputs = [ + Xaw3d + ghostscriptX + perl + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + pkgconfig + libiconv + ]; patchPhase = '' sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in @@ -32,6 +43,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 4655b059b339..58e80e7f7264 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "http://www.daidouji.com/oneko/"; license = licenses.publicDomain; maintainers = [ maintainers.xaverdh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } |