diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 195431898a6d..04b1dafe7e84 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ glib libsndfile ] - ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] + buildInputs = [ glib libsndfile libpulseaudio libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsaLib ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; - cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off"; + cmakeFlags = [ "-Denable-framework=off" ]; meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; @@ -44,6 +44,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu lovek323 ]; platforms = platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index aae9adfed67a..5f02dc27a224 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; - NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { description = "Renders an image of the earth or other planets into the X root window"; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 90766645ecb3..56de61da1c5a 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [cmake]; - NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with stdenv.lib; { description = "Computational Morphometry Toolkit "; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 585e2416b993..b4a2133f7d8f 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error=argument-outside-range"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range"; meta = with stdenv.lib; { description = "A professional free 3D Game Multiphysics Library"; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 03276ce9efd2..91347813a24f 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # /build/clucene-core-2.3.3.4/build/bin/cl_test" doCheck = false; - NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with stdenv.lib; { description = "Core library for full-featured text search engine"; diff --git a/pkgs/misc/jackaudio/darwin-cf.patch b/pkgs/misc/jackaudio/darwin-cf.patch deleted file mode 100644 index 0fc0902a0c48..000000000000 --- a/pkgs/misc/jackaudio/darwin-cf.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp -index 7eea281..4b8d75d 100644 ---- a/common/Jackdmp.cpp -+++ b/common/Jackdmp.cpp -@@ -50,43 +50,11 @@ are "hard-coded" in the source. A much better approach would be to use the contr - - get available drivers and their possible parameters, then prepare to parse them. - */ - --#ifdef __APPLE__ --#include --#include -- --static void notify_server_start(const char* server_name) --{ -- // Send notification to be used in the JackRouter plugin -- CFStringRef ref = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman); -- CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(), -- CFSTR("com.grame.jackserver.start"), -- ref, -- NULL, -- kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions); -- CFRelease(ref); --} -- --static void notify_server_stop(const char* server_name) --{ -- // Send notification to be used in the JackRouter plugin -- CFStringRef ref1 = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman); -- CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(), -- CFSTR("com.grame.jackserver.stop"), -- ref1, -- NULL, -- kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions); -- CFRelease(ref1); --} -- --#else -- - static void notify_server_start(const char* server_name) - {} - static void notify_server_stop(const char* server_name) - {} - --#endif -- - static void copyright(FILE* file) - { - fprintf(file, "jackdmp " VERSION "\n" - diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index b37af235d355..a7b3e5f0fdef 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper +, fetchpatch , bash, libsamplerate, libsndfile, readline, eigen, celt -, wafHook +, wafHook, aften # Darwin Dependencies -, aften, AudioToolbox, CoreAudio, CoreFoundation +, AudioUnit, CoreAudio, cf-private, libobjc, Accelerate # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -39,22 +40,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus - ] ++ optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ]; - - # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet. - patches = optionals stdenv.isDarwin [ ./darwin-cf.patch ]; + aften + ] ++ optionals stdenv.isDarwin [ + AudioUnit CoreAudio Accelerate cf-private libobjc + ]; prePatch = '' substituteInPlace svnversion_regenerate.sh \ --replace /bin/bash ${bash}/bin/bash ''; - # It looks like one of the frameworks depends on - # since frameworks are impure we also have to use the impure CoreFoundation here. - # FIXME: remove when CoreFoundation is updated to 10.11 - preConfigure = optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" - ''; + patches = [ (fetchpatch { + url = "https://github.com/jackaudio/jack2/commit/d851fada460d42508a6f82b19867f63853062583.patch"; + sha256 = "1iwwxjzvgrj7dz3s8alzlhcgmcarjcbkrgvsmy6kafw21pyyw7hp"; + }) ]; wafConfigureFlags = [ "--classic" @@ -76,6 +75,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; - badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3dac4245de4e..3b212b186aac 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { homepage = http://p7zip.sourceforge.net/; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index c7c1b7efc944..1d5cd85a62e6 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out)"; - NIX_CFLAGS_COMPILE = "-Wno-error=reserved-user-defined-literal"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { homepage = http://compression.ca/pbzip2/; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index b1e1bfcdd65e..06d28e844ff3 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { sed 's|LIBS += -lstdc++.6||' -i Makefile ''; - NIX_CFLAGS_COMPILE = [ "-fpermissive" "-Wno-error=reserved-user-defined-literal" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ] + ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ca1a38c4ab48..6d0e07d60f98 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -3,7 +3,7 @@ , stateDir ? "/nix/var" , confDir ? "/etc" , boehmgc -, llvmPackages_6 +, stdenv, llvmPackages_6 }: let @@ -167,7 +167,7 @@ in rec { inherit storeDir stateDir confDir boehmgc; }; - nixStable = callPackage common rec { + nixStable = callPackage common (rec { name = "nix-2.2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; @@ -175,9 +175,9 @@ in rec { }; inherit storeDir stateDir confDir boehmgc; - + } // stdenv.lib.optionalAttrs stdenv.cc.isClang { stdenv = llvmPackages_6.stdenv; - }; + }); nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; @@ -191,8 +191,6 @@ in rec { fromGit = true; inherit storeDir stateDir confDir boehmgc; - - stdenv = llvmPackages_6.stdenv; }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79b693b989c4..a7c00e281dac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22997,7 +22997,8 @@ in jack2 = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; - inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation; + inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; + inherit (darwin) cf-private libobjc; }; libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix