Author: amiddelk
Date: Wed Feb 1 22:09:35 2012
New Revision: 31959
URL: https://nixos.org/websvn/nix/?rev=31959&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/applications/networking/skype/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/skype/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/skype/default.nix Wed Feb
1 22:06:49 2012 (r31958)
+++ nixpkgs/trunk/pkgs/applications/networking/skype/default.nix Wed Feb
1 22:09:35 2012 (r31959)
@@ -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 @@
sha256 = "157ba3ci12bq0nv2m8wlsab45ib5sccqagyna8nixnhqw9q72sxm";
};
- buildInputs = [
+ buildInputs =
+ lib.optional usePulseAudio pulseaudio ++ [
alsaLib
- pulseaudio
stdenv.glibc
stdenv.gcc.gcc
libXv
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Feb 1 22:06:49
2012 (r31958)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Feb 1 22:09:35
2012 (r31959)
@@ -313,6 +313,11 @@
inherit stdenv;
};
+ makeAutostartItem = import ../build-support/make-startupitem {
+ inherit stdenv;
+ inherit lib;
+ };
+
makeInitrd = {contents}: import ../build-support/kernel/make-initrd.nix {
inherit stdenv perl cpio contents ubootChooser;
};
@@ -5256,6 +5261,8 @@
alsaUtils = callPackage ../os-specific/linux/alsa-utils { };
+ microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
+
bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { };
bluez = callPackage ../os-specific/linux/bluez { };
@@ -7477,7 +7484,9 @@
siproxd = callPackage ../applications/networking/siproxd { };
- skype_linux = callPackage_i686 ../applications/networking/skype { };
+ skype_linux = callPackage_i686 ../applications/networking/skype {
+ usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default
(the 100% cpu bug)
+ };
slim = callPackage ../applications/display-managers/slim { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
