From 05de07ee2e0f0b335af2dc4d66f071bc538bb60b Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 11 Aug 2024 05:08:25 +0200 Subject: [PATCH 1/3] melonDS: Update for recent upstream changes * Added enet dependency * Remove Darwin-specific installPhase --- pkgs/by-name/me/melonDS/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index f9e6f089bab1c..7a839de2860e1 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -3,6 +3,7 @@ SDL2, cmake, extra-cmake-modules, + enet, fetchFromGitHub, libGL, libarchive, @@ -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 = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 + enet extra-cmake-modules libarchive libslirp @@ -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 { }; }; From d0afa7dac655d8adcb688a4fdfec3aeb5bba34ec Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 11 Aug 2024 16:09:13 +0200 Subject: [PATCH 2/3] Fix ordering Co-authored-by: Anderson Torres --- pkgs/by-name/me/melonDS/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 7a839de2860e1..50098f25db750 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -2,8 +2,8 @@ lib, SDL2, cmake, - extra-cmake-modules, - enet, + enet, + extra-cmake-modules, fetchFromGitHub, libGL, libarchive, From 665e0551c83ae193e9f1467c883ccc047da47551 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 11 Aug 2024 17:01:20 +0200 Subject: [PATCH 3/3] Fix accidental whitespace --- pkgs/by-name/me/melonDS/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 50098f25db750..925b6c70e4a09 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -2,8 +2,8 @@ lib, SDL2, cmake, - enet, - extra-cmake-modules, + enet, + extra-cmake-modules, fetchFromGitHub, libGL, libarchive,