From 4be712b9e1c70ab24430ec52628b8a5082ad9a69 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 17 Mar 2019 13:54:39 +0100 Subject: [PATCH] spotify: update ffmpeg version Needed for spotify 1.1.x. The update itself is blocked on alsa issues: https://community.spotify.com/t5/Desktop-Linux/spotify-client-1-1-0-98-78-gb45d2a6b-10-from-Ubuntu-package/td-p/4675676 https://community.spotify.com/t5/Desktop-Linux/1-0-98-1-1-0-Crash-when-using-ALSA/td-p/4680398 --- pkgs/applications/audio/spotify/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 6afd8f2dff87..76c10fdef6ce 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 , at-spi2-atk }: @@ -26,7 +26,7 @@ let curl dbus expat - ffmpeg + ffmpeg_3 fontconfig freetype gdk_pixbuf @@ -118,8 +118,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.out}/lib/libavcodec.so.56 $libdir/libavcodec-ffmpeg.so.56 - ln -s ${ffmpeg.out}/lib/libavformat.so.56 $libdir/libavformat-ffmpeg.so.56 + ln -s ${ffmpeg_3.out}/lib/libavcodec.so* $libdir + ln -s ${ffmpeg_3.out}/lib/libavformat.so* $libdir rpath="$out/share/spotify:$libdir" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18755f7db7a6..fef552859b28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19518,7 +19518,6 @@ in spotify = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; libpng = libpng12; - ffmpeg = ffmpeg_2; curl = curl.override { sslSupport = false; gnutlsSupport = true; };