From eb5b7ac72bfb2a87bbc91bbf2a406d1ee844381c Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 25 Nov 2024 03:13:01 +0900 Subject: [PATCH] pkgs/spotify: update Signed-off-by: Ludovico Piero --- pkgs/spotify/default.nix | 257 ++++++++++++++++++++------------------- 1 file changed, 132 insertions(+), 125 deletions(-) diff --git a/pkgs/spotify/default.nix b/pkgs/spotify/default.nix index a4e3081..8610879 100644 --- a/pkgs/spotify/default.nix +++ b/pkgs/spotify/default.nix @@ -6,7 +6,7 @@ xorg, alsa-lib, makeShellWrapper, - wrapGAppsHook, + wrapGAppsHook3, openssl, freetype, glib, @@ -15,9 +15,6 @@ atk, gdk-pixbuf, gtk3, - harfbuzz, - libayatana-appindicator, - libdbusmenu, cups, nspr, nss_latest, @@ -38,24 +35,27 @@ libdrm, mesa, libxkbcommon, + harfbuzz, + libayatana-appindicator, + libdbusmenu, + libGL, # High-DPI support: Spotify's --force-device-scale-factor argument # not added if `null`, otherwise, should be a number. deviceScaleFactor ? null, -}: -let +}: let # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update) # "rev" decides what is actually being downloaded # 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.2.40.599.g606b7f29"; + version = "1.2.50.335.g5e2860a8"; # 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 = "77"; + rev = "81"; deps = [ alsa-lib @@ -67,7 +67,7 @@ let curlWithGnuTls dbus expat - ffmpeg_4 + ffmpeg_4 # Requires libavcodec < 59 as of 1.2.9.743.g85d9593d fontconfig freetype gdk-pixbuf @@ -78,6 +78,7 @@ let libdbusmenu libdrm libgcrypt + libGL libnotify libpng libpulseaudio @@ -105,119 +106,125 @@ let zlib ]; in -stdenv.mkDerivation { - pname = "spotify"; - inherit version; - - # fetch from snapcraft instead of the debian repository most repos fetch from. - # That is a bit more cumbersome. But the debian repository only keeps the last - # two versions, while snapcraft should provide versions indefinitely: - # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 - - # This is the next-best thing, since we're not allowed to re-distribute - # spotify ourselves: - # 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"; - hash = "sha512-XQyZbU6dJh87jEdEvks2D0EpMkjPSKROl8kurSaiPs2z4FZ2SxM2DUvHwtKemKKScdTISm3jh6wyHXwPhB8eNQ=="; - }; - - nativeBuildInputs = [ - wrapGAppsHook - makeShellWrapper - squashfsTools - ]; - - dontStrip = true; - dontPatchELF = true; - - unpackPhase = '' - runHook preUnpack - unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml' - cd squashfs-root - if ! grep -q 'grade: stable' meta/snap.yaml; then - # Unfortunately this check is not reliable: At the moment (2018-07-26) the - # latest version in the "edge" channel is also marked as stable. - echo "The snap package is marked as unstable:" - grep 'grade: ' meta/snap.yaml - echo "You probably chose the wrong revision." - exit 1 - fi - if ! grep -q '${version}' meta/snap.yaml; then - echo "Package version differs from version found in snap metadata:" - grep 'version: ' meta/snap.yaml - echo "While the nix package specifies: ${version}." - echo "You probably chose the wrong revision or forgot to update the nix version." - exit 1 - fi - runHook postUnpack - ''; - - # Prevent double wrapping - dontWrapGApps = true; - - installPhase = '' - runHook preInstall - - libdir=$out/lib/spotify - mkdir -p $libdir - mv ./usr/* $out/ - - cp meta/snap.yaml $out - - # Work around Spotify referring to a specific minor version of - # OpenSSL. - - ln -s ${lib.getLib openssl}/lib/libssl.so $libdir/libssl.so.1.0.0 - ln -s ${lib.getLib openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 - ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so - ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so - - ln -s ${ffmpeg_4.lib}/lib/libavcodec.so* $libdir - ln -s ${ffmpeg_4.lib}/lib/libavformat.so* $libdir - - rpath="$out/share/spotify:$libdir" - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $rpath $out/share/spotify/spotify - - librarypath="${lib.makeLibraryPath deps}:$libdir" - wrapProgramShell $out/share/spotify/spotify \ - ''${gappsWrapperArgs[@]} \ - ${ - lib.optionalString (deviceScaleFactor != null) '' - --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \ - '' - } \ - --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${zenity}/bin" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" - - # fix Icon line in the desktop file (#48062) - sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" - - # Desktop file - mkdir -p "$out/share/applications/" - cp "$out/share/spotify/spotify.desktop" "$out/share/applications/" - - # Icons - for i in 16 22 24 32 48 64 128 256 512; do - ixi="$i"x"$i" - mkdir -p "$out/share/icons/hicolor/$ixi/apps" - ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \ - "$out/share/icons/hicolor/$ixi/apps/spotify-client.png" - done - - runHook postInstall - ''; - - meta = { - homepage = "https://www.spotify.com/"; - description = "Play music from the Spotify music service"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - # license = licenses.unfree; - maintainers = with lib.maintainers; [ ludovicopiero ]; - platforms = [ "x86_64-linux" ]; - }; -} + stdenv.mkDerivation { + pname = "spotify"; + inherit version; + + # fetch from snapcraft instead of the debian repository most repos fetch from. + # That is a bit more cumbersome. But the debian repository only keeps the last + # two versions, while snapcraft should provide versions indefinitely: + # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 + + # This is the next-best thing, since we're not allowed to re-distribute + # spotify ourselves: + # 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"; + hash = "sha256-RrauWQgeZuvk7w0m1xFswDll23RynM6S1MvNDraTJlA="; + }; + + nativeBuildInputs = [ + wrapGAppsHook3 + makeShellWrapper + squashfsTools + ]; + + dontStrip = true; + dontPatchELF = true; + + unpackPhase = '' + runHook preUnpack + unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml' + cd squashfs-root + if ! grep -q 'grade: stable' meta/snap.yaml; then + # Unfortunately this check is not reliable: At the moment (2018-07-26) the + # latest version in the "edge" channel is also marked as stable. + echo "The snap package is marked as unstable:" + grep 'grade: ' meta/snap.yaml + echo "You probably chose the wrong revision." + exit 1 + fi + if ! grep -q '${version}' meta/snap.yaml; then + echo "Package version differs from version found in snap metadata:" + grep 'version: ' meta/snap.yaml + echo "While the nix package specifies: ${version}." + echo "You probably chose the wrong revision or forgot to update the nix version." + exit 1 + fi + runHook postUnpack + ''; + + # Prevent double wrapping + dontWrapGApps = true; + + env = rec { + libdir = "${placeholder "out"}/lib/spotify"; + librarypath = "${lib.makeLibraryPath deps}:${libdir}"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $libdir + mv ./usr/* $out/ + + # Work around Spotify referring to a specific minor version of + # OpenSSL. + + ln -s ${lib.getLib openssl}/lib/libssl.so $libdir/libssl.so.1.0.0 + ln -s ${lib.getLib openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0 + ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so + ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so + + ln -s ${ffmpeg_4.lib}/lib/libavcodec.so* $libdir + ln -s ${ffmpeg_4.lib}/lib/libavformat.so* $libdir + + rpath="$out/share/spotify:$libdir" + + chmod +w "$out/share/spotify/spotify" + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $rpath $out/share/spotify/spotify + + # fix Icon line in the desktop file (#48062) + sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" + + # Desktop file + mkdir -p "$out/share/applications/" + cp "$out/share/spotify/spotify.desktop" "$out/share/applications/" + + # Icons + for i in 16 22 24 32 48 64 128 256 512; do + ixi="$i"x"$i" + mkdir -p "$out/share/icons/hicolor/$ixi/apps" + ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \ + "$out/share/icons/hicolor/$ixi/apps/spotify-client.png" + done + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + wrapProgramShell $out/share/spotify/spotify \ + ''${gappsWrapperArgs[@]} \ + ${lib.optionalString (deviceScaleFactor != null) '' + --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \ + ''} \ + --prefix LD_LIBRARY_PATH : "$librarypath" \ + --prefix PATH : "${zenity}/bin" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + + runHook postFixup + ''; + + meta = { + homepage = "https://www.spotify.com/"; + description = "Play music from the Spotify music service"; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + # license = licenses.unfree; + maintainers = with lib.maintainers; [ludovicopiero]; + platforms = ["x86_64-linux"]; + }; + }