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

Use libpulseaudio instead of pulseaudio

Browse Source
This commit is contained in:
William A. Kennington III
2015-05-29 14:32:56 -07:00
parent cd52c04456
commit b07929b0a3
87 changed files with 184 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/SDL2/default.nix
+3 -3
View File
@@ -2,7 +2,7 @@
, openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null
, x11Support ? true, x11 ? null, libXrandr ? null
, pulseaudioSupport ? true, pulseaudio ? null
, pulseaudioSupport ? true, libpulseaudio ? null
}:
# OSS is no longer supported, for it's much crappier than ALSA and
@@ -12,7 +12,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null);
assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null;
assert pulseaudioSupport -> libpulseaudio != null;
let
configureFlagsFun = attrs: ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
stdenv.lib.optional pulseaudioSupport pulseaudio;
stdenv.lib.optional pulseaudioSupport libpulseaudio;
buildInputs = [ pkgconfig audiofile ] ++
stdenv.lib.optional openglSupport [ mesa ] ++