push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,15 @@
diff --git a/simple64-gui/netplay/joinroom.cpp b/simple64-gui/netplay/joinroom.cpp
index 3b5c34e..68b46f2 100644
--- a/simple64-gui/netplay/joinroom.cpp
+++ b/simple64-gui/netplay/joinroom.cpp
@@ -308,7 +308,9 @@ void JoinRoom::processTextMessage(QString message)
}
else
{
- msgBox.setText(json.value("message").toString());
+ QString msg = json.value("message").toString();
+ if(msg == "Bad authentication code") msg += "<br>Note: using the official netplay servers is not allowed on unofficial builds.<br>You can host your own server with `simple64-netplay-server`";
+ msgBox.setText(msg);
msgBox.exec();
}
}

View File

@@ -0,0 +1,37 @@
diff --git a/build.sh b/build.sh
index 254a90d..e2d26cf 100644
--- a/build.sh
+++ b/build.sh
@@ -77,7 +77,7 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE="${RELEASE_TYPE}" ..
cmake --build .
cp simple64-video-parallel.* "${install_dir}"
-if [[ ! -d "${base_dir}/discord" ]]; then
+if false; then
echo "Downloading Discord SDK"
mkdir -p "${base_dir}/discord"
cd "${base_dir}/discord"
@@ -86,7 +86,7 @@ if [[ ! -d "${base_dir}/discord" ]]; then
rm discord_game_sdk.zip
fi
-if [[ ! -d "${base_dir}/vosk" ]]; then
+if false; then
mkdir -p "${base_dir}/vosk"
cd "${base_dir}/vosk"
if [[ ${UNAME} == *"MINGW64"* ]]; then
@@ -156,14 +156,6 @@ if [[ ${UNAME} == *"MINGW64"* ]]; then
cp -v "${base_dir}/7z/x64/7za.exe" "${install_dir}"
cp -v "${base_dir}/discord/lib/x86_64/discord_game_sdk.dll" "${install_dir}"
cp -v "${base_dir}/vosk/libvosk.dll" "${install_dir}/vosk.dll"
-else
- cp "${base_dir}/vosk/libvosk.so" "${install_dir}"
- if [[ "${PLATFORM}" == "aarch64" ]]; then
- my_os=linux_aarch64
- else
- my_os=linux_x86_64
- cp "${base_dir}/discord/lib/x86_64/discord_game_sdk.so" "${install_dir}/libdiscord_game_sdk.so"
- fi
fi
if [[ "$1" == "zip" ]]; then

View File

@@ -0,0 +1,122 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
writeShellScriptBin,
cmake,
ninja,
pkg-config,
makeWrapper,
zlib,
libpng,
SDL2,
SDL2_net,
hidapi,
qt6,
vulkan-loader,
makeDesktopItem,
copyDesktopItems,
}:
let
cheats-json = fetchurl {
url = "https://raw.githubusercontent.com/simple64/cheat-parser/87963b7aca06e0d4632b66bc5ffe7d6b34060f4f/cheats.json";
hash = "sha256-rS/4Mdi+18C2ywtM5nW2XaJkC1YnKZPc4YdQ3mCfESU=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "simple64";
version = "2024.12.1";
src = fetchFromGitHub {
owner = "simple64";
repo = "simple64";
tag = "v${finalAttrs.version}";
hash = "sha256-rvoUyvhpbibXbAreu6twTeeVRTCbhJiJuyKaJz0uT5k=";
};
patches = [
./dont-use-vosk-and-discord.patch
./add-official-server-error-message.patch
];
postPatch = ''
cp ${cheats-json} cheats.json
'';
stictDeps = true;
nativeBuildInputs = [
qt6.wrapQtAppsHook
cmake
ninja
pkg-config
makeWrapper
copyDesktopItems
# fake git command for version info generator
(writeShellScriptBin "git" "echo ${finalAttrs.src.rev}")
];
buildInputs = [
zlib
libpng
SDL2
SDL2_net
hidapi
qt6.qtbase
qt6.qtwebsockets
qt6.qtwayland
];
dontUseCmakeConfigure = true;
buildPhase = ''
runHook preBuild
sh build.sh
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/simple64 $out/bin
cp -r simple64/* $out/share/simple64
install -Dm644 ./simple64-gui/icons/simple64.svg -t $out/share/icons/hicolor/scalable/apps/
patchelf $out/share/simple64/simple64-gui \
--add-needed libvulkan.so.1 --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
ln -s $out/share/simple64/simple64-gui $out/bin/simple64-gui
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "simple64";
desktopName = "simple64";
genericName = "Nintendo 64 Emulator";
exec = "simple64-gui";
mimeTypes = [ "application/x-n64-rom" ];
icon = "simple64";
terminal = false;
categories = [
"Game"
"Emulator"
];
})
];
meta = {
description = "Easy to use N64 emulator";
homepage = "https://simple64.github.io";
license = lib.licenses.gpl3Only;
mainProgram = "simple64-gui";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.platforms.linux;
};
})