Author: eelco
Date: Mon Jul 18 22:34:57 2011
New Revision: 27831
URL: https://svn.nixos.org/websvn/nix/?rev=27831&sc=1
Log:
* Spotify updated to 0.5.1.151.
Modified:
nixpkgs/trunk/pkgs/applications/audio/spotify/default.nix
nixpkgs/trunk/pkgs/applications/audio/spotify/preload.c
Modified: nixpkgs/trunk/pkgs/applications/audio/spotify/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/spotify/default.nix Mon Jul 18
20:50:59 2011 (r27830)
+++ nixpkgs/trunk/pkgs/applications/audio/spotify/default.nix Mon Jul 18
22:34:57 2011 (r27831)
@@ -2,7 +2,7 @@
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-let version = "0.4.9.302"; in
+let version = "0.5.1.151"; in
stdenv.mkDerivation {
name = "spotify-${version}";
@@ -10,13 +10,13 @@
src =
if stdenv.system == "i686-linux" then
fetchurl {
- url =
"http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g604b4fb-1_i386.deb";;
- sha256 = "1kw3jfvz8a9v6zl3yh6f51vsick35kmcf7vkbjb6wl0nk1a8q8gg";
+ url =
"http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_i386.deb";;
+ sha256 = "1zs52hlji3niaiw9lhwmq1393cydr3i494gpzk3fpwr9n8m1jbk0";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
- url =
"http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g604b4fb-1_amd64.deb";;
- sha256 = "1cghs3hwmqnd7g62g1h2bf3yvxgjq8b94vzhp1w9ysb5rswyjkyv";
+ url =
"http://repository.spotify.com/pool/non-free/s/spotify/spotify-client-qt_${version}.g7c8c074-1_amd64.deb";;
+ sha256 = "01yvrggcj1hvdrqmy35x3klv2v20d63knzfh0lrdfbhi99hr6nvx";
}
else throw "Spotify not supported on this platform.";
@@ -33,7 +33,7 @@
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
- --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver qt4
alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
+ --set-rpath ${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver
xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc ]}:${stdenv.gcc.gcc}/lib64 \
$out/bin/spotify
preload=$out/libexec/spotify/libpreload.so
Modified: nixpkgs/trunk/pkgs/applications/audio/spotify/preload.c
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/spotify/preload.c Mon Jul 18
20:50:59 2011 (r27830)
+++ nixpkgs/trunk/pkgs/applications/audio/spotify/preload.c Mon Jul 18
22:34:57 2011 (r27831)
@@ -57,3 +57,10 @@
int (*___xstat64) (int ver, const char *, struct stat64 *) =
dlsym(RTLD_NEXT, "__xstat64");
return ___xstat64(ver, rewrite(path, buf), st);
}
+
+int access(const char *path, int mode)
+{
+ char buf[PATH_MAX];
+ int (*_access) (const char *path, int mode) = dlsym(RTLD_NEXT, "access");
+ return _access(rewrite(path, buf), mode);
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
