mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
spotify: switch to ffmpeg_2
This commit is contained in:
parent
323ad74b1a
commit
336cd48da9
|
@ -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_0_10, curl, zlib, gnome3
|
||||
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3
|
||||
, at-spi2-atk
|
||||
}:
|
||||
|
||||
|
@ -26,7 +26,7 @@ let
|
|||
curl
|
||||
dbus
|
||||
expat
|
||||
ffmpeg_0_10
|
||||
ffmpeg
|
||||
fontconfig
|
||||
freetype
|
||||
gdk_pixbuf
|
||||
|
@ -118,6 +118,9 @@ 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
|
||||
|
||||
rpath="$out/share/spotify:$libdir"
|
||||
|
||||
patchelf \
|
||||
|
|
|
@ -19453,6 +19453,7 @@ in
|
|||
spotify = callPackage ../applications/audio/spotify {
|
||||
libgcrypt = libgcrypt_1_5;
|
||||
libpng = libpng12;
|
||||
ffmpeg = ffmpeg_2;
|
||||
curl = curl.override {
|
||||
sslSupport = false; gnutlsSupport = true;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue