diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2017-05-12 12:23:56 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2017-05-12 12:23:56 +0300 |
| commit | 7da0b964de1b8f69e7edc1f99324542a1e977562 (patch) | |
| tree | 5c90fcf5d6442db8f3950081715e582bfeea991d | |
| parent | a3539a0dc6e4a895dc8c1b853b8dbfa757008194 (diff) | |
| download | nixpkgs-7da0b964de1b8f69e7edc1f99324542a1e977562.tar nixpkgs-7da0b964de1b8f69e7edc1f99324542a1e977562.tar.gz nixpkgs-7da0b964de1b8f69e7edc1f99324542a1e977562.tar.bz2 nixpkgs-7da0b964de1b8f69e7edc1f99324542a1e977562.tar.lz nixpkgs-7da0b964de1b8f69e7edc1f99324542a1e977562.tar.xz nixpkgs-7da0b964de1b8f69e7edc1f99324542a1e977562.tar.zst nixpkgs-7da0b964de1b8f69e7edc1f99324542a1e977562.zip | |
libao: build both pulse and alsa drivers
| -rw-r--r-- | pkgs/development/libraries/libao/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index f7261e11738..d3cb1283331 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4655c98c2e1..d3cebc7a60b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8198,7 +8198,7 @@ with pkgs; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libao = callPackage ../development/libraries/libao { - usePulseAudio = config.pulseaudio or true; + usePulseAudio = config.pulseaudio or stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; |