Merge pull request #171310 from IvarWithoutBones/fix/dotnetmodule-flags
buildDotnetModule drvs: fix flags
This commit is contained in:
commit
1bae25ac65
2 changed files with 7 additions and 10 deletions
|
@ -58,6 +58,10 @@ buildDotnetModule rec {
|
|||
pulseaudio
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--suffix PATH : ${lib.getBin ffmpeg}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux.
|
||||
];
|
||||
|
@ -66,11 +70,6 @@ buildDotnetModule rec {
|
|||
# workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
|
||||
mkdir -p $out/lib/sndio-6
|
||||
ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
|
||||
|
||||
# Ryujinx tries to use ffmpeg from PATH
|
||||
makeWrapperArgs+=(
|
||||
--suffix PATH : ${lib.makeBinPath [ ffmpeg ]}
|
||||
)
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
@ -31,11 +31,9 @@ buildDotnetModule rec {
|
|||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
preConfigure = ''
|
||||
dotnetFlags+=(
|
||||
--runtime linux-x64
|
||||
)
|
||||
'';
|
||||
dotnetFlags = [
|
||||
"--runtime linux-x64"
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
ffmpeg
|
||||
|
|
Loading…
Reference in a new issue