diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/emulators')
11 files changed, 81 insertions, 52 deletions
diff --git a/nixpkgs/pkgs/applications/emulators/box64/default.nix b/nixpkgs/pkgs/applications/emulators/box64/default.nix index a02eb526fee6..19653ea73060 100644 --- a/nixpkgs/pkgs/applications/emulators/box64/default.nix +++ b/nixpkgs/pkgs/applications/emulators/box64/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gitUpdater , cmake , python3 @@ -15,25 +14,15 @@ assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRi stdenv.mkDerivation (finalAttrs: { pname = "box64"; - version = "0.2.4"; + version = "0.2.6"; src = fetchFromGitHub { owner = "ptitSeb"; repo = "box64"; rev = "v${finalAttrs.version}"; - hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w="; + hash = "sha256-eKYnBuaEWRb6kDGFvuG+xM70LbUAcJ6Zcr6hPHqi9Do="; }; - patches = [ - # Fix crash due to regression in SDL1 AudioCallback signature in 0.2.4 - # Remove when version > 0.2.4 - (fetchpatch { - name = "0001-box64-Fixed_signature_of_SDL1_AudioCallback.patch"; - url = "https://github.com/ptitSeb/box64/commit/5fabd602aea1937e3c5ce58843504c2492b8c0ec.patch"; - hash = "sha256-dBdKijTljCFtSJ2smHrbjH/ok0puGw4YEy/kluLl4AQ="; - }) - ]; - nativeBuildInputs = [ cmake python3 diff --git a/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix b/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix index b147af8d02b7..9c1c31c689ca 100644 --- a/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix +++ b/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix @@ -16,17 +16,17 @@ }: let - version = "2.7.5"; + version = "2.8"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; + hash = "sha256-xuNcWt3Wnh3WlYe6pB4dvP3PY9S5ghL9QQombGn8iyY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update + rev = "v${version}"; hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k="; }; in @@ -39,9 +39,18 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I="; + hash = "sha256-nT/oN2XRU1Du1/IHlkRCzLqFwQ5s9Sr4FQs3ES+aPFs="; }; + patches = [ + ( # Fixes CCEmuX. This is a one-character change that did not make it into the release. + fetchpatch { + url = "https://github.com/MCJack123/craftos2/commit/9ef7e16b69ead69b5fe076724842a1e24b3de058.patch"; + hash = "sha256-SjNnsooDFt3JoVOO0xf6scrGXEQQmrQf91GY7VWaTOw="; + } + ) + ]; + buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; preBuild = '' @@ -50,6 +59,12 @@ stdenv.mkDerivation rec { make -C craftos2-lua linux ''; + buildPhase = '' + runHook preBuild + make + runHook postBuild + ''; + dontStrip = true; installPhase = '' diff --git a/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index 664399f75739..52a7f8a1ba6e 100644 --- a/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -12,7 +11,7 @@ , curl , enet , ffmpeg -, fmt_8 +, fmt_10 , gtest , hidapi , libevdev @@ -24,6 +23,7 @@ , libXdmcp , libXext , libXrandr +, lz4 , lzo , mbedtls_2 , miniupnpc @@ -57,21 +57,17 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-19870"; + version = "5.0-20347"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "032c77b462a220016f23c5079e71bb23e0ad2adf"; - sha256 = "sha256-TgRattksYsMGcbfu4T5mCFO9BkkHRX0NswFxGwZWjEw="; + rev = "dc0814ae4622313d513468bdc377ee9c031de199"; + hash = "sha256-s3mGwXkgdoLLfPEUVyjaqXb+a5KPKC3dhHIyKC2BF1w="; fetchSubmodules = true; }; patches = [ - (fetchpatch { - url = "https://github.com/dolphin-emu/dolphin/commit/c43c9101c07376297abbbbc40ef9a1965a1681cd.diff"; - sha256 = "sha256-yHlyG86ta76YKrJsyefvFh521dNbQOqiPOpRUVxKuZM="; - }) # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070 ./find-minizip-ng.patch ]; @@ -99,7 +95,7 @@ stdenv.mkDerivation rec { curl enet ffmpeg - fmt_8 + fmt_10 gtest hidapi libiconv @@ -107,6 +103,7 @@ stdenv.mkDerivation rec { libspng libusb1 libXdmcp + lz4 lzo mbedtls_2 miniupnpc diff --git a/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix b/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix index 36bcae419654..6f7d0a6a7d6a 100644 --- a/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix +++ b/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix @@ -6,14 +6,13 @@ , curl , extra-cmake-modules , ffmpeg -, gettext -, harfbuzz , libaio , libbacktrace , libpcap -, libsamplerate +, libwebp , libXrandr , libzip +, lz4 , makeWrapper , pkg-config , qtbase @@ -29,6 +28,7 @@ , wrapQtAppsHook , xz , zip +, zstd }: let @@ -36,26 +36,30 @@ let pcsx2_patches = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2_patches"; - rev = "42d7ee72b66955e3bbd2caaeaa855f605b463722"; - sha256 = "sha256-Zd+Aeps2IWVX2fS1Vyczv/wAX8Z89XnCH1eqSPdYEw8="; + rev = "619e75bb8db50325b44863f2ccf3c39470c3d5a3"; + sha256 = "sha256-2KE0W3WwBJCLe8DosyDVsFtEofKgBsChpQEQe+3O+Hg="; }; in llvmPackages_17.stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.5318"; + version = "1.7.5474"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-5SUlq3HQAzROG1yncA4u4XGVv+1I+s9FQ6LgJkiLSD0="; + sha256 = "sha256-5ZCXw6PEQ6Ed6kEP27m9O0U79uVGEFR/vwee6/dZBD8="; }; + patches = [ + ./define-rev.patch + ]; + cmakeFlags = [ "-DDISABLE_ADVANCE_SIMD=ON" "-DUSE_LINKED_FFMPEG=ON" - "-DDISABLE_BUILD_DATE=ON" + "-DPCSX2_GIT_REV=v${version}" ]; nativeBuildInputs = [ @@ -70,14 +74,13 @@ llvmPackages_17.stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg - gettext - harfbuzz libaio libbacktrace libpcap - libsamplerate + libwebp libXrandr libzip + lz4 qtbase qtsvg qttools @@ -85,9 +88,9 @@ llvmPackages_17.stdenv.mkDerivation rec { SDL2 soundtouch vulkan-headers - vulkan-loader wayland xz + zstd ] ++ cubeb.passthru.backendLibs; diff --git a/nixpkgs/pkgs/applications/emulators/pcsx2/define-rev.patch b/nixpkgs/pkgs/applications/emulators/pcsx2/define-rev.patch new file mode 100644 index 000000000000..1f970b1a073b --- /dev/null +++ b/nixpkgs/pkgs/applications/emulators/pcsx2/define-rev.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/Pcsx2Utils.cmake b/cmake/Pcsx2Utils.cmake +index 87f012c..052f1be 100644 +--- a/cmake/Pcsx2Utils.cmake ++++ b/cmake/Pcsx2Utils.cmake +@@ -44,7 +44,6 @@ function(detect_compiler) + endfunction() + + function(get_git_version_info) +- set(PCSX2_GIT_REV "") + set(PCSX2_GIT_TAG "") + set(PCSX2_GIT_HASH "") + if (GIT_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/.git) diff --git a/nixpkgs/pkgs/applications/emulators/retrofe/default.nix b/nixpkgs/pkgs/applications/emulators/retrofe/default.nix index 2a0b41ba2b6c..fe61849d5ae1 100644 --- a/nixpkgs/pkgs/applications/emulators/retrofe/default.nix +++ b/nixpkgs/pkgs/applications/emulators/retrofe/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, glib, gst_all_1, makeWrapper, pkg-config -, python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell +, python3, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "sha256-uBfECbU2Df/pPpEXXq62S7Ec0YU4lPIsZ8k5UmKD7xQ="; }; - nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config python3 ]; buildInputs = [ glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib diff --git a/nixpkgs/pkgs/applications/emulators/vice/default.nix b/nixpkgs/pkgs/applications/emulators/vice/default.nix index 0b6dac328653..7b3a12a4131d 100644 --- a/nixpkgs/pkgs/applications/emulators/vice/default.nix +++ b/nixpkgs/pkgs/applications/emulators/vice/default.nix @@ -4,6 +4,7 @@ , bison , flex , perl +, curl , libpng , giflib , alsa-lib @@ -25,11 +26,11 @@ stdenv.mkDerivation rec { pname = "vice"; - version = "3.7.1"; + version = "3.8"; src = fetchurl { url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; - sha256 = "sha256-fjgR5gJNsGmL+8MhuzJFckRriFPQG0Bz8JhllXsMq5g="; + sha256 = "sha256-HX3E0PK7zCqHG7lU/0pd9jBI3qnBb18em8gmD6QaEAQ="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib + curl giflib gtk3 glew diff --git a/nixpkgs/pkgs/applications/emulators/yuzu/compat-list.nix b/nixpkgs/pkgs/applications/emulators/yuzu/compat-list.nix index 431a2e5197e3..4b8d53116390 100644 --- a/nixpkgs/pkgs/applications/emulators/yuzu/compat-list.nix +++ b/nixpkgs/pkgs/applications/emulators/yuzu/compat-list.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, unstableGitUpdater }: stdenv.mkDerivation { pname = "yuzu-compatibility-list"; - version = "unstable-2023-12-28"; + version = "unstable-2024-01-08"; src = fetchFromGitHub { owner = "flathub"; repo = "org.yuzu_emu.yuzu"; - rev = "0b9bf10851d6ad54441dc4f687d5755ed2c6f7a8"; - hash = "sha256-oWEeAhyxFO1TFH3d+/ivRf1KnNUU8y5c/7NtOzlpKXg="; + rev = "0f5500f50e2a5ac7e40e6f5f8aeb160d46348828"; + hash = "sha256-0JHl7myoa3MlfucmbKB5tubJ6sQ2IlTIL3i2yveOvaU="; }; buildCommand = '' diff --git a/nixpkgs/pkgs/applications/emulators/yuzu/early-access/sources.nix b/nixpkgs/pkgs/applications/emulators/yuzu/early-access/sources.nix index 4f9c6a1f8d39..ec513e7b5e2c 100644 --- a/nixpkgs/pkgs/applications/emulators/yuzu/early-access/sources.nix +++ b/nixpkgs/pkgs/applications/emulators/yuzu/early-access/sources.nix @@ -1,7 +1,7 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-12-29 +# Last updated: 2024-01-10 { - version = "4037"; - distHash = "sha256:0pw56hj13fm9j5nja1lhj839d88w00kcr30kygasr36w9c7yv2n7"; - fullHash = "sha256:0f42fp8z333b3k4pn8j0cp3480llvlygl5p6qfgywhq3g5hcpzpb"; + version = "4056"; + distHash = "sha256:14qd5v238pka9axrxjbaawr0kpkkbd95mzri6jdjxjyzbkk03hmb"; + fullHash = "sha256:0fb4i6708q59ql9ffrw2myanqgxpy20z971y6l7yvxm1pqw9qhyx"; } diff --git a/nixpkgs/pkgs/applications/emulators/yuzu/mainline.nix b/nixpkgs/pkgs/applications/emulators/yuzu/mainline.nix index 6964f272553e..e845603f4cc2 100644 --- a/nixpkgs/pkgs/applications/emulators/yuzu/mainline.nix +++ b/nixpkgs/pkgs/applications/emulators/yuzu/mainline.nix @@ -47,13 +47,13 @@ }: stdenv.mkDerivation(finalAttrs: { pname = "yuzu"; - version = "1665"; + version = "1676"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${finalAttrs.version}"; - hash = "sha256-xzSup1oz83GPpOGh9aJJ5YjoFX/cBI8RV6SvDYNH/zA="; + hash = "sha256-vRrliVuGXI/Dpmdkbj+P5hshzPzB6nijrXQfLXHaGqk="; fetchSubmodules = true; }; @@ -162,6 +162,10 @@ stdenv.mkDerivation(finalAttrs: { ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json ''; + postInstall = '' + install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" "mainline-0-(.*)" ]; }; diff --git a/nixpkgs/pkgs/applications/emulators/yuzu/update.sh b/nixpkgs/pkgs/applications/emulators/yuzu/update.sh new file mode 100755 index 000000000000..4bb96b2105b4 --- /dev/null +++ b/nixpkgs/pkgs/applications/emulators/yuzu/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update +#shellcheck shell=bash +nix-update -u yuzuPackages.nx_tzdb "$@" +nix-update -u yuzuPackages.compat-list "$@" +nix-update -u yuzuPackages.mainline "$@" +nix-update -u yuzuPackages.early-access "$@" |