public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spotify: switch to ffmpeg_2

Browse Source
This commit is contained in:
Piotr Bogdan 2018-11-11 01:24:47 +00:00
parent 323ad74b1a
commit 336cd48da9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/audio/spotify/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng , 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 , at-spi2-atk
}: }:
@ -26,7 +26,7 @@ let
curl curl
dbus dbus
expat expat
ffmpeg_0_10 ffmpeg
fontconfig fontconfig
freetype freetype
gdk_pixbuf gdk_pixbuf
@ -118,6 +118,9 @@ stdenv.mkDerivation {
ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.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" rpath="$out/share/spotify:$libdir"
patchelf \ patchelf \

1
pkgs/top-level/all-packages.nix
View File

@ -19453,6 +19453,7 @@ in
spotify = callPackage ../applications/audio/spotify { spotify = callPackage ../applications/audio/spotify {
libgcrypt = libgcrypt_1_5; libgcrypt = libgcrypt_1_5;
libpng = libpng12; libpng = libpng12;
ffmpeg = ffmpeg_2;
curl = curl.override { curl = curl.override {
sslSupport = false; gnutlsSupport = true; sslSupport = false; gnutlsSupport = true;
}; };