Merge pull request #57798 from timokau/spotify-improvements

Spotify improvements

authored by Timo Kaufmann and committed by GitHub 11c3040e b54478ce

+8 -6
+8 -5
pkgs/applications/audio/spotify/default.nix
··· 1 1 { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype 2 2 , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng 3 - , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 3 + , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 4 4 , at-spi2-atk 5 5 }: 6 6 7 7 let 8 8 # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update) 9 9 # "rev" decides what is actually being downloaded 10 + # If an update breaks things, one of those might have valuable info: 11 + # https://aur.archlinux.org/packages/spotify/ 12 + # https://community.spotify.com/t5/Desktop-Linux 10 13 version = "1.0.96.181.gf6bc1b6b-12"; 11 14 # To get the latest stable revision: 12 15 # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' ··· 26 29 curl 27 30 dbus 28 31 expat 29 - ffmpeg 32 + ffmpeg_3 30 33 fontconfig 31 34 freetype 32 35 gdk_pixbuf ··· 118 121 ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so 119 122 ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so 120 123 121 - ln -s ${ffmpeg.out}/lib/libavcodec.so.56 $libdir/libavcodec-ffmpeg.so.56 122 - ln -s ${ffmpeg.out}/lib/libavformat.so.56 $libdir/libavformat-ffmpeg.so.56 124 + ln -s ${ffmpeg_3.out}/lib/libavcodec.so* $libdir 125 + ln -s ${ffmpeg_3.out}/lib/libavformat.so* $libdir 123 126 124 127 rpath="$out/share/spotify:$libdir" 125 128 ··· 154 157 homepage = https://www.spotify.com/; 155 158 description = "Play music from the Spotify music service"; 156 159 license = licenses.unfree; 157 - maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri ]; 160 + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ]; 158 161 platforms = [ "x86_64-linux" ]; 159 162 }; 160 163 }
-1
pkgs/top-level/all-packages.nix
··· 19522 19522 spotify = callPackage ../applications/audio/spotify { 19523 19523 libgcrypt = libgcrypt_1_5; 19524 19524 libpng = libpng12; 19525 - ffmpeg = ffmpeg_2; 19526 19525 curl = curl.override { 19527 19526 sslSupport = false; gnutlsSupport = true; 19528 19527 };