nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #216332 from GaetanLepage/ffmpeg

Browse Source 
spotify, renpy: fix wrong ffmpeg references
This commit is contained in:
Martin Weinelt 2023-02-14 16:26:45 +00:00 committed by GitHub
commit 5eb6139626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;