nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #333827 from nadiaholmquist/melonDS-enet

Browse Source 
melonDS: Update for recent upstream changes
This commit is contained in:
Benjamin Staffin 2024-08-11 11:53:56 -04:00 committed by GitHub
commit 6c2a4b2622
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
lib, lib,
SDL2, SDL2,
cmake, cmake,
enet,
extra-cmake-modules, extra-cmake-modules,
fetchFromGitHub, fetchFromGitHub,
libGL, libGL,
@ -26,13 +27,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "melonDS"; pname = "melonDS";
version = "0.9.5-unstable-2024-08-05"; version = "0.9.5-unstable-2024-08-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "melonDS-emu"; owner = "melonDS-emu";
repo = "melonDS"; repo = "melonDS";
rev = "dd386d12a94252364b5e0706ec719c390faf90b8"; rev = "e290c42360f5f2ae7182c5430234545f3b066876";
hash = "sha256-pgTtRNifyziioY+GN4BQFVFHlKKK1Da5XioLUnGRGpQ="; hash = "sha256-idsUxEsR9MPAY3arH4UNEsB6Cds4yZUaZOilqUQCnDE";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = buildInputs =
[ [
SDL2 SDL2
enet
extra-cmake-modules extra-cmake-modules
libarchive libarchive
libslirp libslirp
@ -74,13 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
"--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" "--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 = { passthru = {
updateScript = unstableGitUpdater { }; updateScript = unstableGitUpdater { };
}; };