diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-26 01:13:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-26 01:13:50 +0100 |
commit | 9cc575741df943328b2dbbf6ef7c5dfd49c1bbe0 (patch) | |
tree | 63fd7efce5ca91066a37634edc754a9720113457 /pkgs/applications/emulators | |
parent | c612fc6155f86797fa7a2eaaa6a4726d4aae5fce (diff) | |
parent | 4076d988121889c6caeec208f790abe5363a08b6 (diff) |
Merge pull request #269237 from vs49688/rpcs3-update
rpcs3: 0.0.28-15409-fd6829f75 -> 0.0.29-15726-ebf48800e
Diffstat (limited to 'pkgs/applications/emulators')
5 files changed, 0 insertions, 190 deletions
diff --git a/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules b/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules deleted file mode 100644 index a4f32124d970b..0000000000000 --- a/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules +++ /dev/null @@ -1,5 +0,0 @@ -# DualShock 3 over USB -KERNEL=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0268", MODE="0666" - -# DualShock 3 over Bluetooth -KERNEL=="hidraw*", KERNELS=="*054C:0268*", MODE="0666" diff --git a/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules b/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules deleted file mode 100644 index 6061debfbff8f..0000000000000 --- a/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules +++ /dev/null @@ -1,14 +0,0 @@ -# DualShock 4 over USB -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", MODE="0666" - -# DualShock 4 Wireless Adapter over USB -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ba0", MODE="0666" - -# DualShock 4 Slim over USB -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", MODE="0666" - -# DualShock 4 over Bluetooth -KERNEL=="hidraw*", KERNELS=="*054C:05C4*", MODE="0666" - -# DualShock 4 Slim over Bluetooth -KERNEL=="hidraw*", KERNELS=="*054C:09CC*", MODE="0666" diff --git a/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules b/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules deleted file mode 100644 index fb3ed3eec3f5b..0000000000000 --- a/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules +++ /dev/null @@ -1,5 +0,0 @@ -# PS5 DualSense controller over USB hidraw -KERNEL=="hidraw*", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ce6", MODE="0660", TAG+="uaccess" - -# PS5 DualSense controller over bluetooth hidraw -KERNEL=="hidraw*", KERNELS=="*054C:0CE6*", MODE="0660", TAG+="uaccess" diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix deleted file mode 100644 index 88b3ddbb17502..0000000000000 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, wrapQtAppsHook -, cmake -, pkg-config -, git -, qtbase -, qtquickcontrols -, qtmultimedia -, openal -, glew -, vulkan-headers -, vulkan-loader -, libpng -, libSM -, ffmpeg -, libevdev -, libusb1 -, zlib -, curl -, wolfssl -, python3 -, pugixml -, flatbuffers -, llvm_16 -, cubeb -, faudioSupport ? true -, faudio -, SDL2 -, waylandSupport ? true -, wayland -}: - -let - # Keep these separate so the update script can regex them - rpcs3GitVersion = "15409-fd6829f75"; - rpcs3Version = "0.0.28-15409-fd6829f75"; - rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c"; - rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk="; -in -stdenv.mkDerivation { - pname = "rpcs3"; - version = rpcs3Version; - - src = fetchFromGitHub { - owner = "RPCS3"; - repo = "rpcs3"; - rev = rpcs3Revision; - fetchSubmodules = true; - hash = rpcs3Hash; - }; - - passthru.updateScript = ./update.sh; - - preConfigure = '' - cat > ./rpcs3/git-version.h <<EOF - #define RPCS3_GIT_VERSION "${rpcs3GitVersion}" - #define RPCS3_GIT_FULL_BRANCH "RPCS3/rpcs3/master" - #define RPCS3_GIT_BRANCH "HEAD" - #define RPCS3_GIT_VERSION_NO_UPDATE 1 - EOF - ''; - - cmakeFlags = [ - "-DUSE_SYSTEM_ZLIB=ON" - "-DUSE_SYSTEM_LIBUSB=ON" - "-DUSE_SYSTEM_LIBPNG=ON" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_WOLFSSL=ON" - "-DUSE_SYSTEM_FAUDIO=ON" - "-DUSE_SYSTEM_PUGIXML=ON" - "-DUSE_SYSTEM_FLATBUFFERS=ON" - "-DUSE_SYSTEM_SDL=ON" - "-DWITH_LLVM=ON" - "-DBUILD_LLVM=OFF" - "-DUSE_NATIVE_INSTRUCTIONS=OFF" - "-DUSE_FAUDIO=${if faudioSupport then "ON" else "OFF"}" - ]; - - nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; - - buildInputs = [ - qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM - ] ++ cubeb.passthru.backendLibs - ++ lib.optionals faudioSupport [ faudio SDL2 ] - ++ lib.optional waylandSupport wayland; - - postInstall = '' - # Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration - install -D ${./99-ds3-controllers.rules} $out/etc/udev/rules.d/99-ds3-controllers.rules - install -D ${./99-ds4-controllers.rules} $out/etc/udev/rules.d/99-ds4-controllers.rules - install -D ${./99-dualsense-controllers.rules} $out/etc/udev/rules.d/99-dualsense-controllers.rules - ''; - - meta = with lib; { - description = "PS3 emulator/debugger"; - homepage = "https://rpcs3.net/"; - maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; - license = licenses.gpl2Only; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "rpcs3"; - }; -} diff --git a/pkgs/applications/emulators/rpcs3/update.sh b/pkgs/applications/emulators/rpcs3/update.sh deleted file mode 100755 index 1efecc7ec88c3..0000000000000 --- a/pkgs/applications/emulators/rpcs3/update.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix gnused jq nix-prefetch-git curl cacert - -set -eou pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename $ROOT)" == "rpcs3" || ! -f "$ROOT/default.nix" ]]; then - echo "ERROR: Not in the rpcs3 folder" - exit 1 -fi - -if [[ ! -v GITHUB_TOKEN ]]; then - echo "ERROR: \$GITHUB_TOKEN not set" - exit 1 -fi - -payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' <<EOF | curl -s -H "Authorization: bearer $GITHUB_TOKEN" -d '@-' https://api.github.com/graphql -{ - repository(owner: "RPCS3", name: "rpcs3") { - branch: ref(qualifiedName: "refs/heads/master") { - target { - oid - ... on Commit { - history { - totalCount - } - } - } - } - - tag: refs(refPrefix: "refs/tags/", first: 1, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { - nodes { - name - } - } - } -} -EOF -) - -commit_sha=$(jq -r .data.repository.branch.target.oid <<< "$payload") -major_ver=$(jq -r .data.repository.tag.nodes[0].name <<< "$payload" | sed 's/^v//g') -commit_count=$(jq -r .data.repository.branch.target.history.totalCount <<< "$payload") -git_ver="$commit_count-${commit_sha::9}" -final_ver="$major_ver-$git_ver" - - -echo "INFO: Latest commit is $commit_sha" -echo "INFO: Latest version is $final_ver" - -nix_hash=$(nix-prefetch-git --quiet --fetch-submodules https://github.com/RPCS3/rpcs3.git "$commit_sha" | jq -r .sha256) -nix_hash=$(nix hash to-sri --type sha256 "$nix_hash") -echo "INFO: Hash is $nix_hash" - -sed -i -E \ - -e "s/rpcs3GitVersion\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3GitVersion = \"${git_ver}\";/g" \ - -e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \ - -e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \ - -e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \ - "$ROOT/default.nix" |