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 | |
| 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
| -rw-r--r-- | pkgs/applications/audio/openmpt123/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libao/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index a13009407eb9..da0f74848888 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; }; buildInputs = [ SDL2 pkgconfig flac libsndfile ]; - makeFlags = [ "NO_LTDL=1 TEST=0 EXAMPLES=0" ] + makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; installFlags = "PREFIX=\${out}"; 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81a93893824a..faa2d2db948f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8271,7 +8271,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; }; |