Merge pull request #57868 from Kaali/coreaudio-sox

Add CoreAudio to sox on macOS
NixOS · Mar 19, 2019 · 373488e · 373488e
2 parents 8403965 + 3cc74c3
commit 373488e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, stdenv, fetchurl
+{ config, lib, stdenv, fetchurl, CoreAudio
 , enableAlsa ? true, alsaLib ? null
 , enableLibao ? true, libao ? null
 , enableLame ? config.sox.enableLame or false, lame ? null
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     optional enablePNG libpng ++
     optional enableLibsndfile libsndfile ++
     optionals enableAMR [ amrnb amrwb ] ++
-    optional enableLibpulseaudio libpulseaudio;
+    optional enableLibpulseaudio libpulseaudio ++
+    optional (stdenv.isDarwin) CoreAudio;
 
   meta = {
     description = "Sample Rate Converter for audio";

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -19521,7 +19521,9 @@ in
 
   soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { };
 
-  sox = callPackage ../applications/misc/audio/sox { };
+  sox = callPackage ../applications/misc/audio/sox {
+    inherit (darwin.apple_sdk.frameworks) CoreAudio;
+  };
 
   soxr = callPackage ../applications/misc/audio/soxr { };