From c344f46321a66965876101338bafdfbbec4faa38 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:32:58 -0500 Subject: [PATCH 01/13] djview: fix macOS build --- pkgs/applications/graphics/djview/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 85c0f58174a..2b0dde210c5 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig -, djvulibre, qt4, xorg, libtiff }: +, djvulibre, qt4, xorg, libtiff +, darwin }: stdenv.mkDerivation rec { name = "djview-${version}"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ djvulibre qt4 xorg.libXt libtiff ]; + buildInputs = [ djvulibre qt4 xorg.libXt libtiff ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; From 6a6b371a775c8ded3060ffd6984675dd1be4934e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:33:27 -0500 Subject: [PATCH 02/13] liblastfm: fix macOS build --- pkgs/development/libraries/liblastfm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 0beb689090a..aa76505c3a0 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }: +{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake +, darwin }: let version = "1.0.9"; in @@ -15,6 +16,7 @@ stdenv.mkDerivation rec { prefixKey = "--prefix "; propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; nativeBuildInputs = [ pkgconfig which cmake ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = { homepage = http://github.com/lastfm/liblastfm; From 719cb89342258705d4a2607f5bac7b21f5e46a73 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:35:21 -0500 Subject: [PATCH 03/13] wxsqlite3: fix macOS build --- pkgs/development/libraries/wxsqlite3/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 88cf92b34ef..a0600399784 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, wxGTK, sqlite }: +{ stdenv, fetchFromGitHub, wxGTK, sqlite +, darwin }: stdenv.mkDerivation rec { name = "wxsqlite3-${version}"; @@ -11,7 +12,12 @@ stdenv.mkDerivation rec { sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g"; }; - buildInputs = [ wxGTK sqlite ]; + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + cp build28/Info.plist.in build28/wxmac.icns build/ + ''; + + buildInputs = [ wxGTK sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; meta = with stdenv.lib; { homepage = http://utelle.github.io/wxsqlite3/ ; From efcd597ab626934370a7b8b7eaac065720bbcbe2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:53:29 -0500 Subject: [PATCH 04/13] cwebbin: Fix macOS build --- pkgs/development/tools/misc/cwebbin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 75a06291b02..458f85c1082 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "CP=cp" "RM=rm" "PDFTEX=echo" + "CC=c++" ]; buildPhase = '' From 9e7faf98838dc0c9808c472af95f3f8fb083da8d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:53:41 -0500 Subject: [PATCH 05/13] exult: Fix macOS build --- pkgs/games/exult/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 27ffcf2e742..649d69c6fe6 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' mkdir -p $out/share/exult/music From 1953cb5f714e0f11e1dae2477ae0a835df40bd58 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:54:29 -0500 Subject: [PATCH 06/13] sysdig: fix macOS build --- pkgs/os-specific/linux/sysdig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b23da5451d1..27a0d301acf 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc ]; - postInstall = '' + postInstall = optionalString (!stdenv.isDarwin) '' patchelf --set-rpath "$libPath" "$out/bin/sysdig" patchelf --set-rpath "$libPath" "$out/bin/csysdig" '' + optionalString (kernel != null) '' From 06716f310ab8e037ffbccc3c3a993c8cdfbab18a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:55:25 -0500 Subject: [PATCH 07/13] zstmdt: fix macOS build --- pkgs/tools/compression/zstdmt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix index 14dd4f21b2d..5cf88e68c64 100644 --- a/pkgs/tools/compression/zstdmt/default.nix +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { zstd lz4 ]; - buildPhase = '' - make zstdmt lz4mt - ''; + makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ]; installPhase = '' mkdir -p $out/bin/ From 65d9a8e4fb6fc889b52e94cdbface3a21f051e8a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:55:49 -0500 Subject: [PATCH 08/13] rrdtool: fix macOS build --- pkgs/tools/misc/rrdtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index de4c97731ef..3d2666add42 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff -, tcl-8_5 }: +, tcl-8_5, darwin }: stdenv.mkDerivation rec { name = "rrdtool-1.6.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5; + ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support From d98323515562d564f53dedc12d35707b0be3f43b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:56:09 -0500 Subject: [PATCH 09/13] nuttcp: fix macOS build --- pkgs/tools/networking/nuttcp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 70f3d7e9c70..23cce602875 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { unpackPhase = ":"; buildPhase = '' - gcc -O2 -o nuttcp $src + cc -O2 -o nuttcp $src ''; installPhase = '' From 8dbefea7149d3c47924ac31f97189e7485e1e218 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 7 Apr 2017 22:57:13 -0500 Subject: [PATCH 10/13] lout: fix macOS build --- pkgs/tools/typesetting/lout/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index ec52adc225b..cd3b9c67e3c 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -39,6 +39,6 @@ cat makefile | \ > "$nixMakefile" && \ mkdir -p "$out/bin" && mkdir -p "$out/lib" \ mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" install installman && \ +make -f "$nixMakefile" CC=cc install installman && \ installDoc && \ fixupPhase From 3baff95efd0da6805cc82835a986ef142c3e4147 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 8 Apr 2017 23:49:55 -0500 Subject: [PATCH 11/13] botan: fix macOS build --- pkgs/development/libraries/botan/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 4a4ec5d9fe9..b37fd6079b9 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -3,6 +3,7 @@ , baseVersion, revision, sha256 , extraConfigureFlags ? "" , postPatch ? null +, darwin , ... }: @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { }; inherit postPatch; - buildInputs = [ python bzip2 zlib gmp openssl boost ]; + buildInputs = [ python bzip2 zlib gmp openssl boost ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; configurePhase = '' python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } From cb180f47d403157f2cc5046fdd45a88031258efd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 9 Apr 2017 15:47:55 -0500 Subject: [PATCH 12/13] cwebbin: fix src --- pkgs/development/tools/misc/cwebbin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 458f85c1082..f4d9de184e3 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ascherer"; repo = "cwebbin"; - rev = name; + rev = "2016-05-20-22p"; sha256 = "0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr"; }; From dd25b6da62ca6bb6a28a87a39e3505cf6b6a933a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 9 Apr 2017 18:33:48 -0500 Subject: [PATCH 13/13] cwebbin: fix src again --- pkgs/development/tools/misc/cwebbin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index f4d9de184e3..a952475b967 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; cweb = fetchurl { - url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb.tar.gz; + url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz; sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; };