public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating skype. Finally!

Browse Source 
I think that patchelf was breaking the binary, and I decided to use a wrapper
with a LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=19968
This commit is contained in:
Lluís Batlle i Rossell 2010-02-12 23:19:37 +00:00
parent 9cddc91b91
commit 683688f476
2 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pkgs/applications/networking/skype/default.nix
View File

@ -1,64 +1,61 @@
args: with args; {stdenv, fetchurl, alsaLib, libXv, libXi, libXrender, libXrandr, zlib, glib
stdenv.mkDerivation ( rec { , libXext, libX11, libXScrnSaver, libSM, qt, libICE, freetype, fontconfig}:
pname = "skype";
version = "2.0.0.72"; assert stdenv.system == "i686-linux";
name = "skype-2.0";
stdenv.mkDerivation rec {
name = "skype-2.1.0.81";
src = fetchurl { src = fetchurl {
url = http://download.skype.com/linux/skype_static-2.0.0.72.tar.bz2; url = "http://download.skype.com/linux/${name}.tar.bz2";
sha256 = "2f37963e8f19c0ec5efd8631abe9633b6551f09dee024460c40fad10728bc580"; sha256 = "1x18m4900c0ssaq95wv8mhhgwvw9fh66dszx7zq24zgvb2v1h4jz";
name = "${pname}_static-${version}.tar.bz2";
}; };
buildInputs = [ buildInputs = [
alsaLib alsaLib
glibc stdenv.glibc
gcc.gcc stdenv.gcc.gcc
libXv
libXext
libX11
qt
libXScrnSaver
libSM libSM
libICE libICE
libXi libXi
libXv
libXScrnSaver
libXrender libXrender
libXrandr libXrandr
libXfixes
libXcursor
libXinerama
freetype freetype
fontconfig fontconfig
libXext zlib
libX11 glib
fontconfig
libsigcxx
]; ];
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
installPhase ="
ensureDir \$out/{opt/skype/,bin}; installPhase = ''
cp -r * \$out/opt/skype/; ensureDir $out/{opt/skype/,bin}
cat >\$out/bin/skype << EOF cp -r * $out/opt/skype/
#!/bin/sh
\$out/opt/skype/skype --resources=\$out/opt/skype \\$@
EOF
chmod +x \$out/bin/skype
fullPath= fullPath=
for i in \$buildInputs; do for i in $buildNativeInputs; do
fullPath=\$fullPath\${fullPath:+:}\$i/lib fullPath=$fullPath''${fullPath:+:}$i/lib
done done
echo patchelf --interpreter \"\$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\ dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)"
--set-rpath \$fullPath \\
\$out/opt/skype/skype cat > $out/bin/skype << EOF
patchelf --interpreter \"\$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\ #!${stdenv.shell}
--set-rpath \$fullPath \\ export LD_LIBRARY_PATH=$fullPath:$LD_LIBRARY_PATH
\$out/opt/skype/skype $dynlinker $out/opt/skype/skype --resources=$out/opt/skype "\$@"
"; EOF
chmod +x $out/bin/skype
'';
meta = { meta = {
description = "A P2P-VoiceIP client"; description = "A P2P-VoiceIP client";
homepage = http://www.skype.com; homepage = http://www.skype.com;
license = "skype-eula"; license = "skype-eula";
}; };
}) }

8
pkgs/top-level/all-packages.nix
View File

@ -7921,9 +7921,11 @@ let
skype_linux = import ../applications/networking/skype { skype_linux = import ../applications/networking/skype {
inherit fetchurl stdenv; inherit fetchurl stdenv;
inherit glibc alsaLib freetype fontconfig libsigcxx gcc; inherit alsaLib freetype fontconfig zlib;
inherit (xlibs) libSM libICE libXi libXrender libXrandr libXfixes libXcursor qt = qt46;
libXinerama libXext libX11 libXv libXScrnSaver; inherit (xlibs) libXext libX11 libXv libXScrnSaver libSM libICE
libXi libXrender libXrandr;
inherit (gtkLibs) glib;
}; };
slim = import ../applications/display-managers/slim { slim = import ../applications/display-managers/slim {