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

skype: Update to 4.0.0.8

Browse source 
Also, use $out/libexec/skype rather than $out/opt/skype.
This commit is contained in:
Eelco Dolstra 2012-11-08 16:21:04 +01:00
parent a668efbae2
commit 5d6860ec5b
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,21 +5,21 @@
assert stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
name = "skype-4.0.0.7";
name = "skype-4.0.0.8";
src = fetchurl {
url = "http://download.skype.com/linux/${name}.tar.bz2";
sha256 = "0mrswawqsv53mfghqlj1bzq0jfswha6b0c06px7snd85pd4gn5fn";
sha256 = "0gq24rbmjd05ihraarn45rwr79gidnwgllvprzrh5zqx02xll17p";
};
buildInputs =
buildInputs =
lib.optional usePulseAudio pulseaudio ++ [
alsaLib
stdenv.glibc
stdenv.glibc
stdenv.gcc.gcc
libXv
libXext
libX11
libXext
libX11
qt4
libXScrnSaver
libSM
@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
phases = "unpackPhase installPhase";
installPhase = ''
mkdir -p $out/{opt/skype/,bin}
cp -r * $out/opt/skype/
mkdir -p $out/{libexec/skype/,bin}
cp -r * $out/libexec/skype/
fullPath=
for i in $buildNativeInputs; do
@ -45,18 +45,18 @@ stdenv.mkDerivation rec {
done
dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)"
cat > $out/bin/skype << EOF
#!${stdenv.shell}
export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH
$dynlinker $out/opt/skype/skype --resources=$out/opt/skype "\$@"
$dynlinker $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
EOF
chmod +x $out/bin/skype
# Fixup desktop file
substituteInPlace skype.desktop --replace \
"Icon=skype.png" "Icon=$out/opt/skype/icons/SkypeBlue_48x48.png"
"Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_48x48.png"
substituteInPlace skype.desktop --replace \
"Terminal=0" "Terminal=false"
mkdir -p $out/share/applications
@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "A P2P-VoiceIP client";
homepage = http://www.skype.com;
license = "skype-eula";
description = "A proprietary voice-over-IP (VoIP) client";
homepage = http://www.skype.com/;
license = "unfree";
};
}

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

@ -7667,7 +7667,7 @@ let
siproxd = callPackage ../applications/networking/siproxd { };
skype_linux = callPackage_i686 ../applications/networking/instant-messengers/skype {
skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
usePulseAudio = config.pulseaudio or false; # disabled by default (the 100% cpu bug)
};