mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
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:
parent
49893ec540
commit
5cdc569477
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, pulseaudio
|
||||
{ stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib
|
||||
, usePulseAudio }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -8,7 +8,8 @@ stdenv.mkDerivation {
|
||||
sha256 = "e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig ] ++ stdenv.lib.optional usePulseAudio pulseaudio;
|
||||
buildInputs = [ pkgconfig alsaLib ] ++ (if usePulseAudio then [ pulseaudio ]
|
||||
else [ alsaLib ]);
|
||||
|
||||
meta = {
|
||||
longDescription = ''
|
||||
|
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1c7pl5k3d60wacnha8zfn2dixz7hiiaxvijis4559y15bs8mxl5p";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib gettext ncurses ];
|
||||
buildInputs = [ alsaLib ncurses ];
|
||||
buildNativeInputs = [ gettext ];
|
||||
|
||||
configureFlags = "--disable-xmlto";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user