From 820da05d785a47d01521bfb46c65c0b28b3534a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 00:50:19 +0200 Subject: [PATCH 1/6] xorg.xorgcffiles: Don't use darwin's /usr/bin All imake (xmkmf) based builds use the lib/X11/config/darwin.cf file to define locations of cpp, cc, c++ (in /usr/bin by default). We remove the directoy part to force darwin builds to search the $PATH for those commands. --- pkgs/servers/x11/xorg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0d09d523b52..74e2b301e70 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2570,6 +2570,9 @@ let url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" + ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; From 4f7941406e410cfa2213681c8b563a05b85b97b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 00:55:08 +0200 Subject: [PATCH 2/6] xskat: enable darwin build --- pkgs/games/xskat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index bd41531d923..383bdb88284 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Famous german card game''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; homepage = http://www.xskat.de/; From ac02a1348f58cd5f1edb8fcff6e117c7ee160a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:08:23 +0200 Subject: [PATCH 3/6] oneko: enable darwin build --- pkgs/applications/misc/oneko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 4655b059b33..58e80e7f726 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; }; } From 7637894bf230d00aa05b02f10394d6c2aad2061a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:15:31 +0200 Subject: [PATCH 4/6] Xaw3d: enable darwin build --- pkgs/development/libraries/Xaw3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 07d256f4f57..eea18cd5638 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "3D widget set based on the Athena Widget set"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 625fa4dfe8b74642e411298ace91fdec57cef18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:20:05 +0200 Subject: [PATCH 5/6] gv: enable darwin build --- pkgs/applications/misc/gv/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 3fad634b18b..b13e7ae5232 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|\|${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; }; } From 48382349186e1ed8a502b40f69635d327fb00113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 20 Apr 2018 01:37:54 +0200 Subject: [PATCH 6/6] xsok: enable darwin build --- pkgs/games/xsok/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index e683e96d206..0aa0c97f07d 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { sed -e '/chown /d' -i src/Imakefile sed -e '/chmod /d' -i src/Imakefile sed -e '/InstallAppDefaults/d' -i src/Imakefile + sed -e 's/CC = gcc/CC = cc/g' -i src/Imakefile ''; makeFlags = ["BINDIR=$(out)/bin"]; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { description = "A generic Sokoban game for X11"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://tracker.debian.org/pkg/xsok; }; }