diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 16:55:47 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 16:55:47 +0000 |
| commit | 5cdc569477c34b95bd3aed614f221bc133f6aee5 (patch) | |
| tree | 506d44cf83234baf1844070dc73a99ff0c103124 /pkgs/development/libraries/libao | |
| parent | 49893ec540443f319f8d2c41d3f6f217c9d09702 (diff) | |
Allowing alsa utils to cross-build, and libao to output to alsa (not only to
pulseAudio) svn path=/nixpkgs/branches/stdenv-updates/; revision=23315
Diffstat (limited to 'pkgs/development/libraries/libao')
| -rw-r--r-- | pkgs/development/libraries/libao/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 856980f102535..ae70e775dd1a2 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -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 = '' |