about summary refs log tree commit diff
path: root/pkgs/applications/audio
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-05-20 02:48:23 +0300
committerGitHub <noreply@github.com>2023-05-20 02:48:23 +0300
commit38a567bc7f70d3ae03ae2014f2f32511bfe17f09 (patch)
tree24c40cd62ed859d2010398d9b5abfd94e7beb6d6 /pkgs/applications/audio
parent6db7e6aeebc4e0bd1f25449d17d50663f5673240 (diff)
parent7c428691d28b345cc4c7c3ad80a876ccad72f7bd (diff)
Merge pull request #232871 from Atemu/fix/spotify-local-files-old-libavcodec
spotify: use ffmpeg_4
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r--pkgs/applications/audio/spotify/linux.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix
index bd869cc543bc8..0a5e368384d93 100644
--- a/pkgs/applications/audio/spotify/linux.nix
+++ b/pkgs/applications/audio/spotify/linux.nix
@@ -1,6 +1,6 @@
 { 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, curlWithGnuTls, zlib, gnome
+, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome
 , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
 , pname, meta, harfbuzz
   # High-DPI support: Spotify's --force-device-scale-factor argument
@@ -33,7 +33,7 @@ let
     curlWithGnuTls
     dbus
     expat
-    ffmpeg
+    ffmpeg_4 # Requires libavcodec < 59 as of 1.2.9.743.g85d9593d
     fontconfig
     freetype
     gdk-pixbuf
@@ -135,8 +135,8 @@ stdenv.mkDerivation {
       ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
 
-      ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir
-      ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir
+      ln -s ${ffmpeg_4.lib}/lib/libavcodec.so* $libdir
+      ln -s ${ffmpeg_4.lib}/lib/libavformat.so* $libdir
 
       rpath="$out/share/spotify:$libdir"