From 317094d9917b67a002bb37b4512f62d55c7c07b3 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 26 Jul 2024 14:19:24 -0400 Subject: [PATCH] fix(spotify): stop maintaining my own version of spotify --- modules/home/apps/music/spotify/default.nix | 14 +- packages/spotify/default.nix | 225 -------------------- 2 files changed, 13 insertions(+), 226 deletions(-) delete mode 100644 packages/spotify/default.nix diff --git a/modules/home/apps/music/spotify/default.nix b/modules/home/apps/music/spotify/default.nix index eab9ea6..f2079e3 100644 --- a/modules/home/apps/music/spotify/default.nix +++ b/modules/home/apps/music/spotify/default.nix @@ -20,7 +20,19 @@ in { programs.spicetify = { enable = true; theme = spicePkgs.themes.catppuccin; - spotifyPackage = pkgs.custom.spotify; + spotifyPackage = pkgs.spotify.overrideAttrs { + fixupPhase = '' + runHook preFixup + + wrapProgramShell $out/share/spotify/spotify \ + ''${gappsWrapperArgs[@]} \ + --prefix LD_LIBRARY_PATH : "$librarypath" \ + --prefix PATH : "${pkgs.gnome.zenity}/bin" \ + --add-flags "--disable-gpu" + + runHook postFixup + ''; + }; colorScheme = "mocha"; enabledExtensions = with spicePkgs.extensions; [ diff --git a/packages/spotify/default.nix b/packages/spotify/default.nix deleted file mode 100644 index fdafa85..0000000 --- a/packages/spotify/default.nix +++ /dev/null @@ -1,225 +0,0 @@ -# my own build of spotify to disable hardware accel until hyprland supports explicit sync -{ - fetchurl, - lib, - stdenv, - squashfsTools, - xorg, - alsa-lib, - makeShellWrapper, - wrapGAppsHook, - openssl, - freetype, - glib, - pango, - cairo, - atk, - gdk-pixbuf, - gtk3, - cups, - nspr, - nss_latest, - libpng, - libnotify, - libgcrypt, - systemd, - fontconfig, - dbus, - expat, - ffmpeg_4, - curlWithGnuTls, - zlib, - gnome, - at-spi2-atk, - at-spi2-core, - libpulseaudio, - libdrm, - mesa, - libxkbcommon, - harfbuzz, - libayatana-appindicator, - libdbusmenu, - # High-DPI support: Spotify's --force-device-scale-factor argument - # not added if `null`, otherwise, should be a number. - deviceScaleFactor ? null, -}: 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.37.701.ge66eb7bc"; - # 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 = "76"; - - pname = "spotify"; - - meta = with lib; { - homepage = "https://www.spotify.com/"; - description = "Play music from the Spotify music service"; - sourceProvenance = with sourceTypes; [binaryNativeCode]; - license = licenses.unfree; - platforms = ["x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; - mainProgram = "spotify"; - }; - - deps = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curlWithGnuTls - dbus - expat - ffmpeg_4 # Requires libavcodec < 59 as of 1.2.9.743.g85d9593d - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - harfbuzz - libayatana-appindicator - libdbusmenu - libdrm - libgcrypt - libnotify - libpng - libpulseaudio - libxkbcommon - mesa - nss_latest - pango - stdenv.cc.cc - systemd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst - zlib - ]; -in - stdenv.mkDerivation { - inherit pname 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 { - name = "spotify-${version}-${rev}.snap"; - url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-k7aw1QM3NCFkm0tXcHgYyeEBagGFpCL6JdWlFruJszPloiCy5vopOsD4PdqyiSEs0rSUP0rLxX2UBs3XuI5cUA=="; - }; - - 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 : "${gnome.zenity}/bin" \ - --add-flags "--disable-gpu" - - # 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 = - meta - // { - maintainers = with lib.maintainers; [eelco ftrvxmtrx sheenobu timokau ma27]; - }; - }