diff options
Diffstat (limited to 'pkgs/by-name/me/melonDS/package.nix')
-rw-r--r-- | pkgs/by-name/me/melonDS/package.nix | 90 |
1 files changed, 55 insertions, 35 deletions
diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 6f66934fd0e43..925b6c70e4a09 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -1,35 +1,39 @@ -{ lib -, SDL2 -, cmake -, extra-cmake-modules -, fetchFromGitHub -, libGL -, libarchive -, libpcap -, libsForQt5 -, libslirp -, pkg-config -, stdenv -, unstableGitUpdater -, wayland -, zstd +{ + lib, + SDL2, + cmake, + enet, + extra-cmake-modules, + fetchFromGitHub, + libGL, + libarchive, + libpcap, + libslirp, + pkg-config, + qt6, + stdenv, + unstableGitUpdater, + wayland, + zstd, }: let - inherit (libsForQt5) + inherit (qt6) qtbase qtmultimedia - wrapQtAppsHook; + qtwayland + wrapQtAppsHook + ; in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-06-24"; + version = "0.9.5-unstable-2024-08-11"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "db20771ef36bfa5bc0dc624cf245844507724107"; - hash = "sha256-XGDMA+0IOvl1UN2HgfLikpxHXl/p0z+Yv6fJs5xv08Y="; + rev = "e290c42360f5f2ae7182c5430234545f3b066876"; + hash = "sha256-idsUxEsR9MPAY3arH4UNEsB6Cds4yZUaZOilqUQCnDE"; }; nativeBuildInputs = [ @@ -38,23 +42,39 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - SDL2 - extra-cmake-modules - libarchive - libslirp - libGL - qtbase - qtmultimedia - wayland - zstd - ]; + buildInputs = + [ + SDL2 + enet + extra-cmake-modules + libarchive + libslirp + libGL + qtbase + qtmultimedia + zstd + ] + ++ lib.optionals stdenv.isLinux [ + wayland + qtwayland + ]; + + cmakeFlags = [ (lib.cmakeBool "USE_QT6" true) ]; strictDeps = true; - qtWrapperArgs = [ - "--prefix LD_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 ]}" + ]; passthru = { updateScript = unstableGitUpdater { }; @@ -88,6 +108,6 @@ stdenv.mkDerivation (finalAttrs: { benley shamilton ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) |