diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
commit | 6f723b9bad655a64f1234557b5e08b5ce9556228 (patch) | |
tree | 68931ba6b8defdba041734ccc72ac40a0fee5b94 /pkgs/applications/audio | |
parent | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (diff) | |
parent | 7d4f67a23f599d82f26d1ec9b89f82e1cc5f3ba9 (diff) | |
download | nixpkgs-6f723b9bad655a64f1234557b5e08b5ce9556228.tar nixpkgs-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.gz nixpkgs-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.bz2 nixpkgs-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.lz nixpkgs-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.xz nixpkgs-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.zst nixpkgs-6f723b9bad655a64f1234557b5e08b5ce9556228.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 77aa7994994..f7b24aa2824 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 -, at-spi2-atk +, at-spi2-atk, at-spi2-core, apulse }: let @@ -10,20 +10,22 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.0.96.181.gf6bc1b6b-12"; + version = "1.1.10.546.ge08ef575-19"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "30"; + rev = "36"; deps = [ alsaLib + apulse atk at-spi2-atk + at-spi2-core cairo cups curl @@ -72,7 +74,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56"; + sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f"; }; buildInputs = [ squashfsTools makeWrapper ]; @@ -134,6 +136,8 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ + --prefix LD_LIBRARY_PATH : "${apulse}/lib/apulse" \ + --set APULSE_PLAYBACK_DEVICE plug:dmix \ --prefix PATH : "${gnome3.zenity}/bin" # fix Icon line in the desktop file (#48062) @@ -158,7 +162,7 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = licenses.unfree; - maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ]; + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau angristan ]; platforms = [ "x86_64-linux" ]; }; } |