forked from mirrors/nixpkgs
Update to latest spotify
This commit is contained in:
parent
b512e3e934
commit
784d2b2d16
|
@ -3,7 +3,7 @@
|
||||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.8.4.103";
|
version = "0.8.8.323";
|
||||||
qt4webkit =
|
qt4webkit =
|
||||||
if stdenv.system == "i686-linux" then
|
if stdenv.system == "i686-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
|
@ -25,13 +25,13 @@ stdenv.mkDerivation {
|
||||||
src =
|
src =
|
||||||
if stdenv.system == "i686-linux" then
|
if stdenv.system == "i686-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g9cb177b.260-1_i386.deb";
|
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_i386.deb";
|
||||||
sha256 = "1iri6pgavgb06nx0l3myqryx7zd7cf22my8vh2v6w4kbvaajjl31";
|
sha256 = "13q803qlvq16yrr7f95izp9mqqdb8kpcsyrb5gc5i2pya68ra906";
|
||||||
}
|
}
|
||||||
else if stdenv.system == "x86_64-linux" then
|
else if stdenv.system == "x86_64-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g9cb177b.260-1_amd64.deb";
|
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_amd64.deb";
|
||||||
sha256 = "0y5kyfa1gk16d9z67hgssam8hgzw6g5f7xsxk0lz3ak487xdwl6k";
|
sha256 = "0ny3z499wks1dhrd3qq4d6cp0zd33198z9vak8ffgm5x24sdpghf";
|
||||||
}
|
}
|
||||||
else throw "Spotify not supported on this platform.";
|
else throw "Spotify not supported on this platform.";
|
||||||
|
|
||||||
|
@ -43,8 +43,8 @@ stdenv.mkDerivation {
|
||||||
''
|
''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
dpkg-deb -x $src $out
|
dpkg-deb -x $src $out
|
||||||
mv $out/usr/* $out/
|
mv $out/opt/spotify/* $out/
|
||||||
rmdir $out/usr
|
rm -rf $out/usr $out/opt
|
||||||
|
|
||||||
# Work around Spotify referring to a specific minor version of
|
# Work around Spotify referring to a specific minor version of
|
||||||
# OpenSSL.
|
# OpenSSL.
|
||||||
|
@ -57,14 +57,13 @@ stdenv.mkDerivation {
|
||||||
ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
|
ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
|
||||||
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
|
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
|
||||||
|
|
||||||
for f in ${chromium}/libexec/chromium/*; do
|
mkdir -p $out/bin
|
||||||
ln -s $f $out/bin/$(basename $f)
|
|
||||||
done
|
|
||||||
|
|
||||||
|
ln -s $out/spotify-client/spotify $out/bin/spotify
|
||||||
patchelf \
|
patchelf \
|
||||||
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
|
||||||
--set-rpath $out/lib:$out/share/spotify:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \
|
--set-rpath $out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \
|
||||||
$out/bin/spotify
|
$out/spotify-client/spotify
|
||||||
|
|
||||||
dpkg-deb -x ${qt4webkit} ./
|
dpkg-deb -x ${qt4webkit} ./
|
||||||
mkdir -p $out/lib/
|
mkdir -p $out/lib/
|
||||||
|
|
Loading…
Reference in a new issue