Commit a51f9c5c authored by Gaetan Lepage's avatar Gaetan Lepage
Browse files

spotify, renpy: fix wrong ffmpeg references

The ffmpeg library derivation output is ffmpeg.lib and no more ffmpeg.out.
This PR updates the remaining references to ffmpeg.out.
parent 6d19d026
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,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* $libdir
      ln -s ${ffmpeg.out}/lib/libavformat.so* $libdir
      ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir
      ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir

      rpath="$out/share/spotify:$libdir"

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
  ]);

  RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
    SDL2 SDL2.dev libpng ffmpeg.out freetype glew.dev libGLU libGL fribidi zlib
    SDL2 SDL2.dev libpng ffmpeg.lib freetype glew.dev libGLU libGL fribidi zlib
  ]);

  enableParallelBuilding = true;