pyrox.dev
spotify: remove broken 32-bit support and cleanup workarounds
+7
-29
pkgs/applications/audio/spotify/default.nix
+7
-29
pkgs/applications/audio/spotify/default.nix
···
3
3
, libgcrypt, chromium, udev, fontconfig
4
4
, dbus, expat }:
5
5
6
-
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
6
+
assert stdenv.system == "x86_64-linux";
7
7
8
8
let
9
-
version = if stdenv.system == "i686-linux"
10
-
then "0.9.4.183.g644e24e.428"
11
-
else "0.9.17.1.g9b85d43.7";
9
+
version = "0.9.17.1.g9b85d43.7";
12
10
13
11
deps = [
14
12
alsaLib
···
29
27
pango
30
28
qt4
31
29
stdenv.cc.cc
30
+
udev
32
31
xlibs.libX11
33
32
xlibs.libXcomposite
34
33
xlibs.libXdamage
···
47
46
name = "spotify-${version}";
48
47
49
48
src =
50
-
if stdenv.system == "i686-linux" then
51
-
fetchurl {
52
-
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_i386.deb";
53
-
sha256 = "1wl6v5x8vm74h5lxp8fhvmih8l122aadsf1qxvpk0k3y6mbx0ifa";
54
-
}
55
-
else if stdenv.system == "x86_64-linux" then
56
-
fetchurl {
57
-
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
58
-
sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki";
59
-
}
60
-
else throw "Spotify not supported on this platform.";
49
+
fetchurl {
50
+
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
51
+
sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki";
52
+
};
61
53
62
54
buildInputs = [ dpkg makeWrapper ];
63
55
···
74
66
# Work around Spotify referring to a specific minor version of
75
67
# OpenSSL.
76
68
77
-
ln -s ${nss}/lib/libnss3.so $libdir/libnss3.so.1d
78
-
ln -s ${nss}/lib/libnssutil3.so $libdir/libnssutil3.so.1d
79
-
ln -s ${nss}/lib/libsmime3.so $libdir/libsmime3.so.1d
80
-
81
-
${if stdenv.system == "x86_64-linux" then ''
82
69
ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
83
70
ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
84
71
ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
85
72
ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
86
-
'' else ''
87
-
ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.0.9.8
88
-
ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.0.9.8
89
-
ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so.0d
90
-
ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so.0d
91
-
''}
92
-
93
-
# Work around Spotify trying to open libudev.so.1 (which we don't have)
94
-
ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1
95
73
96
74
mkdir -p $out/bin
97
75