mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge pull request #333827 from nadiaholmquist/melonDS-enet
melonDS: Update for recent upstream changes
This commit is contained in:
commit
6c2a4b2622
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
SDL2,
|
||||
cmake,
|
||||
enet,
|
||||
extra-cmake-modules,
|
||||
fetchFromGitHub,
|
||||
libGL,
|
||||
@ -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 { };
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user