Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

melonDS: Update for recent upstream changes #333827

Merged
merged 3 commits into from
Aug 11, 2024
Merged

melonDS: Update for recent upstream changes #333827

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05de07e
melonDS: Update for recent upstream changes
nadiaholmquist Aug 11, 2024
d0afa7d
Fix ordering
nadiaholmquist Aug 11, 2024
665e055
Fix accidental whitespace
nadiaholmquist Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions pkgs/by-name/me/melonDS/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
SDL2,
cmake,
enet,
extra-cmake-modules,
fetchFromGitHub,
libGL,
Expand All @@ -26,13 +27,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonDS";
version = "0.9.5-unstable-2024-08-05";
version = "0.9.5-unstable-2024-08-11";

src = fetchFromGitHub {
owner = "melonDS-emu";
repo = "melonDS";
rev = "dd386d12a94252364b5e0706ec719c390faf90b8";
hash = "sha256-pgTtRNifyziioY+GN4BQFVFHlKKK1Da5XioLUnGRGpQ=";
rev = "e290c42360f5f2ae7182c5430234545f3b066876";
hash = "sha256-idsUxEsR9MPAY3arH4UNEsB6Cds4yZUaZOilqUQCnDE";
};

nativeBuildInputs = [
Expand All @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs =
[
SDL2
enet
extra-cmake-modules
libarchive
libslirp
Expand Down Expand Up @@ -74,13 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
"--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 { };
};
Expand Down