summary refs log tree commit diff
path: root/pkgs/development/libraries/portaudio
diff options
context:
space:
mode:
authorMatthew Leach <dev@mattleach.net>2021-07-11 11:43:13 +0100
committerMatthew Leach <dev@mattleach.net>2021-07-12 22:21:56 +0100
commit9d1ef5706ad5fc0e4231f98f3c23eb31a476c614 (patch)
treee10112e2aeebf708470edfcd024430b0a7991fa0 /pkgs/development/libraries/portaudio
parentf899fd3c61218784bce173c1b96e08eef0bbf64f (diff)
downloadnixpkgs-9d1ef5706ad5fc0e4231f98f3c23eb31a476c614.tar
nixpkgs-9d1ef5706ad5fc0e4231f98f3c23eb31a476c614.tar.gz
nixpkgs-9d1ef5706ad5fc0e4231f98f3c23eb31a476c614.tar.bz2
nixpkgs-9d1ef5706ad5fc0e4231f98f3c23eb31a476c614.tar.lz
nixpkgs-9d1ef5706ad5fc0e4231f98f3c23eb31a476c614.tar.xz
nixpkgs-9d1ef5706ad5fc0e4231f98f3c23eb31a476c614.tar.zst
nixpkgs-9d1ef5706ad5fc0e4231f98f3c23eb31a476c614.zip
portaudio: 190600-20161030 -> 190700_20210406
Build the latest port audio.  Also fix the build on apple silicon.
Diffstat (limited to 'pkgs/development/libraries/portaudio')
-rw-r--r--pkgs/development/libraries/portaudio/default.nix36
1 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index efa68146e8d..7f5818ae1bb 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,32 +1,32 @@
-{ lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2
-, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
-
-stdenv.mkDerivation {
-  name = "portaudio-190600-20161030";
+{ lib
+, stdenv
+, fetchurl
+, alsa-lib
+, pkg-config
+, AudioUnit
+, AudioToolbox
+, CoreAudio
+, CoreServices
+, Carbon }:
+
+stdenv.mkDerivation rec {
+  pname = "portaudio";
+  version =  "190700_20210406";
 
   src = fetchurl {
-    url = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz";
-    sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm";
+    url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz";
+    sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libjack2 ]
-    ++ lib.optional (!stdenv.isDarwin) alsa-lib;
+  buildInputs = lib.optional (!stdenv.isDarwin) alsa-lib;
 
   configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
 
-  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays";
 
   propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
 
-  patchPhase = lib.optionalString stdenv.isDarwin ''
-    sed -i '50 i\
-      #include <CoreAudio/AudioHardware.h>\
-      #include <CoreAudio/AudioHardwareBase.h>\
-      #include <CoreAudio/AudioHardwareDeprecated.h>' \
-      include/pa_mac_core.h
-  '';
-
   # not sure why, but all the headers seem to be installed by the make install
   installPhase = ''
     make install