diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-05-24 22:20:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 22:20:00 +0200 |
| commit | dd22335c3b4dbeef800bd368767a9ac22d3c80cb (patch) | |
| tree | b2bc89d36b60a1164152504cfb669ae43f55eecc /pkgs/development/libraries | |
| parent | 53b3b1b6986e225ec10d951edff41b5da8da48d0 (diff) | |
| parent | 7da0b964de1b8f69e7edc1f99324542a1e977562 (diff) | |
| download | nixlib-dd22335c3b4dbeef800bd368767a9ac22d3c80cb.tar nixlib-dd22335c3b4dbeef800bd368767a9ac22d3c80cb.tar.gz nixlib-dd22335c3b4dbeef800bd368767a9ac22d3c80cb.tar.bz2 nixlib-dd22335c3b4dbeef800bd368767a9ac22d3c80cb.tar.lz nixlib-dd22335c3b4dbeef800bd368767a9ac22d3c80cb.tar.xz nixlib-dd22335c3b4dbeef800bd368767a9ac22d3c80cb.tar.zst nixlib-dd22335c3b4dbeef800bd368767a9ac22d3c80cb.zip | |
Merge pull request #25680 from gnidorah/master2
openmpt123: don't build pulseaudio driver, libao: build both pulse and alsa drivers
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libao/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index f7261e117389..d3cb1283331b 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ] ++ - lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++ + lib.optional usePulseAudio libpulseaudio ++ + lib.optional stdenv.isLinux alsaLib ++ lib.optional stdenv.isLinux libcap ++ lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; |