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

Allowing alsa utils to cross-build, and libao to output to alsa (not only to 

pulseAudio)

svn path=/nixpkgs/branches/stdenv-updates/; revision=23315
This commit is contained in:
Lluís Batlle i Rossell 2010-08-21 16:55:47 +00:00
parent 49893ec540
commit 5cdc569477
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pulseaudio { stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib
, usePulseAudio }: , usePulseAudio }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -8,7 +8,8 @@ stdenv.mkDerivation {
sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954"; sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954";
}; };
buildInputs = [ pkgconfig ] ++ stdenv.lib.optional usePulseAudio pulseaudio; buildInputs = [ pkgconfig alsaLib ] ++ (if usePulseAudio then [ pulseaudio ]
else [ alsaLib ]);
meta = { meta = {
longDescription = '' longDescription = ''

3
pkgs/os-specific/linux/alsa-utils/default.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1c7pl5k3d60wacnha8zfn2dixz7hiiaxvijis4559y15bs8mxl5p"; sha256 = "1c7pl5k3d60wacnha8zfn2dixz7hiiaxvijis4559y15bs8mxl5p";
}; };
buildInputs = [ alsaLib gettext ncurses ]; buildInputs = [ alsaLib ncurses ];
buildNativeInputs = [ gettext ];
configureFlags = "--disable-xmlto"; configureFlags = "--disable-xmlto";