cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #171310 from IvarWithoutBones/fix/dotnetmodule-flags

Browse source 
buildDotnetModule drvs: fix flags
This commit is contained in:
Ivv 2022-05-14 23:15:25 +02:00 committed by GitHub
commit 1bae25ac65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/emulators/ryujinx/default.nix
View file

@ -58,6 +58,10 @@ buildDotnetModule rec {
pulseaudio pulseaudio
]; ];
makeWrapperArgs = [
"--suffix PATH : ${lib.getBin ffmpeg}"
];
patches = [ patches = [
./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. ./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 # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
mkdir -p $out/lib/sndio-6 mkdir -p $out/lib/sndio-6
ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.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 = '' preFixup = ''

8
pkgs/games/osu-lazer/default.nix
View file

@ -31,11 +31,9 @@ buildDotnetModule rec {
nativeBuildInputs = [ copyDesktopItems ]; nativeBuildInputs = [ copyDesktopItems ];
preConfigure = '' dotnetFlags = [
dotnetFlags+=( "--runtime linux-x64"
--runtime linux-x64 ];
)
'';
runtimeDeps = [ runtimeDeps = [
ffmpeg ffmpeg