public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25680 from gnidorah/master2

Browse Source 
openmpt123: don't build pulseaudio driver, libao: build both pulse and alsa drivers
This commit is contained in:
Franz Pletz 2017-05-24 22:20:00 +02:00 committed by GitHub
commit dd22335c3b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/openmpt123/default.nix
View File

@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
}; };
buildInputs = [ SDL2 pkgconfig flac libsndfile ]; 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"; ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0";
installFlags = "PREFIX=\${out}"; installFlags = "PREFIX=\${out}";

3
pkgs/development/libraries/libao/default.nix
View File

@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig ] ++ [ 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.optional stdenv.isLinux libcap ++
lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ]; lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];

2
pkgs/top-level/all-packages.nix
View File

@ -8271,7 +8271,7 @@ with pkgs;
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
libao = callPackage ../development/libraries/libao { libao = callPackage ../development/libraries/libao {
usePulseAudio = config.pulseaudio or true; usePulseAudio = config.pulseaudio or stdenv.isLinux;
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
}; };