diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-03-19 19:11:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 19:11:13 +0100 |
| commit | 373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c (patch) | |
| tree | 59435945d374b685d8e0db7fc2347d90b729fe0e | |
| parent | 8403965d014b998711df5f870d98739ffd69fcd1 (diff) | |
| parent | 3cc74c3a7c2857f4bd09a08864f662a5794a7069 (diff) | |
| download | nixpkgs-373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c.tar nixpkgs-373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c.tar.gz nixpkgs-373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c.tar.bz2 nixpkgs-373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c.tar.lz nixpkgs-373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c.tar.xz nixpkgs-373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c.tar.zst nixpkgs-373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c.zip | |
Merge pull request #57868 from Kaali/coreaudio-sox
Add CoreAudio to sox on macOS
| -rw-r--r-- | pkgs/applications/misc/audio/sox/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 878e62c68cb..a598ec1caca 100644 --- 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 index 9dff4cd9226..90daabcf890 100644 --- 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 { }; |