diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-01-27 19:00:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 19:00:12 +0100 |
| commit | fede41404dbce299a50f1c02d751317cc53341bb (patch) | |
| tree | b785d65a37206d4dde33a8a9175f473748c84d2b /pkgs/applications | |
| parent | 35518331d67c9b6ab88430825c5edc2512035700 (diff) | |
| parent | c626c85dce94e1e5cc891e3895bc67c3a1fab48d (diff) | |
| download | nixlib-fede41404dbce299a50f1c02d751317cc53341bb.tar nixlib-fede41404dbce299a50f1c02d751317cc53341bb.tar.gz nixlib-fede41404dbce299a50f1c02d751317cc53341bb.tar.bz2 nixlib-fede41404dbce299a50f1c02d751317cc53341bb.tar.lz nixlib-fede41404dbce299a50f1c02d751317cc53341bb.tar.xz nixlib-fede41404dbce299a50f1c02d751317cc53341bb.tar.zst nixlib-fede41404dbce299a50f1c02d751317cc53341bb.zip | |
Merge pull request #50220 from pbogdan/ffmpeg-cleanup
ffmpeg: misc cleanups
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 06f8e8616f0d..6afd8f2dff87 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_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 \ |