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

spotify, renpy: fix wrong ffmpeg references

Browse Source 
The ffmpeg library derivation output is ffmpeg.lib and no more ffmpeg.out.
This PR updates the remaining references to ffmpeg.out.
This commit is contained in:
Gaetan Lepage 2023-02-14 17:18:22 +01:00
parent 6d19d026f9
commit a51f9c5c1c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"

2
pkgs/development/interpreters/renpy/default.nix
View File

@ -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;