Merge pull request #25680 from gnidorah/master2

openmpt123: don't build pulseaudio driver, libao: build both pulse and alsa drivers
2017-05-24 22:20:00 +02:00
parent 53b3b1b698 7da0b964de
commit dd22335c3b
3 changed files with 4 additions and 3 deletions
--- 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 ];