diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-29 10:39:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-29 10:39:52 +0200 |
| commit | b95dfb09b8fc88b64edf10c487281114857f80a2 (patch) | |
| tree | c5f60541bc8b3765ce70da0a34867e5a46c0a532 /pkgs/misc | |
| parent | 3628af3b6833825edf8d05e4b84c9c38a8c45c5a (diff) | |
| parent | 9cce7eab8d0a386577bb0f65e47e58e03f630ab7 (diff) | |
| download | nixlib-b95dfb09b8fc88b64edf10c487281114857f80a2.tar nixlib-b95dfb09b8fc88b64edf10c487281114857f80a2.tar.gz nixlib-b95dfb09b8fc88b64edf10c487281114857f80a2.tar.bz2 nixlib-b95dfb09b8fc88b64edf10c487281114857f80a2.tar.lz nixlib-b95dfb09b8fc88b64edf10c487281114857f80a2.tar.xz nixlib-b95dfb09b8fc88b64edf10c487281114857f80a2.tar.zst nixlib-b95dfb09b8fc88b64edf10c487281114857f80a2.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a7b3e5f0fdef..fb7c26a6d7ae 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper , fetchpatch , bash, libsamplerate, libsndfile, readline, eigen, celt -, wafHook, aften +, wafHook # Darwin Dependencies -, AudioUnit, CoreAudio, cf-private, libobjc, Accelerate +, aften, AudioUnit, CoreAudio, cf-private, libobjc, Accelerate # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -40,9 +40,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus - aften ] ++ optionals stdenv.isDarwin [ - AudioUnit CoreAudio Accelerate cf-private libobjc + aften AudioUnit CoreAudio Accelerate cf-private libobjc ]; prePatch = '' |