ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-15 17:07:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #330422 from Gliczy/melonDSfix

Browse Source 
melonDS: format with nixfmt-rfc-style; fix segfault on wayland
This commit is contained in:
Benjamin Staffin 2024-07-27 12:23:44 -04:00 committed by GitHub
commit ba3a78d20a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/by-name/me/melonDS/package.nix
View File

@ -21,7 +21,8 @@ let
qtbase
qtmultimedia
qtwayland
wrapQtAppsHook;
wrapQtAppsHook
;
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonDS";
@ -40,38 +41,45 @@ stdenv.mkDerivation (finalAttrs: {
wrapQtAppsHook
];
buildInputs = [
SDL2
extra-cmake-modules
libarchive
libslirp
libGL
qtbase
qtmultimedia
zstd
] ++ lib.optionals stdenv.isLinux [
wayland
qtwayland
];
buildInputs =
[
SDL2
extra-cmake-modules
libarchive
libslirp
libGL
qtbase
qtmultimedia
zstd
]
++ lib.optionals stdenv.isLinux [
wayland
qtwayland
];
cmakeFlags = [
(lib.cmakeBool "USE_QT6" true)
];
cmakeFlags = [ (lib.cmakeBool "USE_QT6" true) ];
strictDeps = true;
qtWrapperArgs = lib.optionals stdenv.isLinux [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
] ++ lib.optionals stdenv.isDarwin [
"--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
];
qtWrapperArgs =
lib.optionals stdenv.isLinux [
"--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libpcap
wayland
]
}"
]
++ lib.optionals stdenv.isDarwin [
"--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
];
installPhase = lib.optionalString stdenv.isDarwin ''
runHook preInstall
mkdir -p $out/Applications
cp -r melonDS.app $out/Applications/
runHook postInstall
'';
'';
passthru = {
updateScript = unstableGitUpdater { };