alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'skype43' of git://github.com/nslqqq/nixpkgs

Browse source 
skype: 4.2.0.13 -> 4.3.0.37
This commit is contained in:
Shea Levy 2014-06-26 12:02:15 -04:00
parent bf1f2c6b1f e2ff019965
commit 731288059c
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/networking/instant-messengers/skype/default.nix
View file

@ -1,20 +1,18 @@
{ stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
, pulseaudio, usePulseAudio, lib }:
, pulseaudio, lib, ... }:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
name = "skype-4.2.0.13";
name = "skype-4.3.0.37";
src = fetchurl {
url = "http://download.skype.com/linux/${name}.tar.bz2";
sha256 = "137kp6c0v4z7n7pp4hwrx4gjgk4knwj815dc6swh44lb5cj1c5m5";
sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc";
};
buildInputs =
lib.optional usePulseAudio pulseaudio ++ [
alsaLib
buildInputs = [
stdenv.glibc
stdenv.gcc.gcc
libXv
@ -27,6 +25,7 @@ stdenv.mkDerivation rec {
libXi
libXrender
libXrandr
pulseaudio
freetype
fontconfig
zlib
@ -44,13 +43,13 @@ stdenv.mkDerivation rec {
fullPath=$fullPath''${fullPath:+:}$i/lib
done
dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)"
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$fullPath" $out/libexec/skype/skype
cat > $out/bin/skype << EOF
#!${stdenv.shell}
export PULSE_LATENCY_MSEC=60 # workaround for pulseaudio glitches
export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH
$dynlinker $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
$out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
EOF
chmod +x $out/bin/skype

4
pkgs/top-level/all-packages.nix
View file

@ -9438,9 +9438,7 @@ let
siproxd = callPackage ../applications/networking/siproxd { };
skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
usePulseAudio = config.pulseaudio or true;
};
skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };