diff options
| author | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-01 22:09:35 +0000 |
|---|---|---|
| committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-01 22:09:35 +0000 |
| commit | cc145f2ae91d8c3fa304853cdcfbbe2347085cf9 (patch) | |
| tree | 8473300e60d43b2ec4f8697ec234e28746fe02d2 /pkgs/applications | |
| parent | acda2c1967274b710d922d783ed7ab0d14acaffd (diff) | |
| download | nixlib-cc145f2ae91d8c3fa304853cdcfbbe2347085cf9.tar nixlib-cc145f2ae91d8c3fa304853cdcfbbe2347085cf9.tar.gz nixlib-cc145f2ae91d8c3fa304853cdcfbbe2347085cf9.tar.bz2 nixlib-cc145f2ae91d8c3fa304853cdcfbbe2347085cf9.tar.lz nixlib-cc145f2ae91d8c3fa304853cdcfbbe2347085cf9.tar.xz nixlib-cc145f2ae91d8c3fa304853cdcfbbe2347085cf9.tar.zst nixlib-cc145f2ae91d8c3fa304853cdcfbbe2347085cf9.zip | |
Update of skype expression: make the use of pulse audio optional based on the configuration setting for pulse audio (off by default).
Removing pulse audio from the build inputs when it is not used prevents the bug of Skype taking 100% cpu from showing up. This demonstrates nicely nix' features: in other distributions the recomended solution was to remove read permission from the pulse audio libs. svn path=/nixpkgs/trunk/; revision=31959
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/skype/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 8d3645e38195..45e225496ebb 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig -, pulseaudio }: +, pulseaudio, usePulseAudio, lib }: assert stdenv.system == "i686-linux"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm"; }; - buildInputs = [ + buildInputs = + lib.optional usePulseAudio pulseaudio ++ [ alsaLib - pulseaudio stdenv.glibc stdenv.gcc.gcc libXv |