rpcs3: 0.0.37 -> 0.0.38, unvendor some dependencies (#448077)
This commit is contained in:
@@ -2,7 +2,6 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchpatch2,
|
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
cmake,
|
cmake,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
@@ -34,6 +33,13 @@
|
|||||||
waylandSupport ? true,
|
waylandSupport ? true,
|
||||||
wayland,
|
wayland,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
|
miniupnpc,
|
||||||
|
rtmidi,
|
||||||
|
asmjit,
|
||||||
|
glslang,
|
||||||
|
zstd,
|
||||||
|
hidapi,
|
||||||
|
vulkan-memory-allocator,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@@ -46,24 +52,16 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "rpcs3";
|
pname = "rpcs3";
|
||||||
version = "0.0.37";
|
version = "0.0.38";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "RPCS3";
|
owner = "RPCS3";
|
||||||
repo = "rpcs3";
|
repo = "rpcs3";
|
||||||
tag = "v${finalAttrs.version}";
|
tag = "v${finalAttrs.version}";
|
||||||
hash = "sha256-/ve1qe76Rc+mXHemq8DI2U9IP6+tPV5m5SNh/wmppEw=";
|
hash = "sha256-HaguOzCN0/FvAb0b4RZWnw9yvVum14wEj26WnqOnSag=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch2 {
|
|
||||||
# https://github.com/RPCS3/rpcs3/pull/17316
|
|
||||||
url = "https://github.com/RPCS3/rpcs3/commit/bad6e992586264344ee1a3943423863d2bd39b45.patch?full_index=1";
|
|
||||||
hash = "sha256-rSyA1jcmRiV6m8rPKqTnDFuBh9WYFTGmyTSU2qrd+Go=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
@@ -89,6 +87,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
(lib.cmakeBool "USE_SYSTEM_SDL" true)
|
(lib.cmakeBool "USE_SYSTEM_SDL" true)
|
||||||
(lib.cmakeBool "USE_SYSTEM_OPENCV" true)
|
(lib.cmakeBool "USE_SYSTEM_OPENCV" true)
|
||||||
(lib.cmakeBool "USE_SYSTEM_CUBEB" true)
|
(lib.cmakeBool "USE_SYSTEM_CUBEB" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_MINIUPNPC" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_RTMIDI" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_GLSLANG" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_ZSTD" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_HIDAPI" true)
|
||||||
|
(lib.cmakeBool "USE_SYSTEM_VULKAN_MEMORY_ALLOCATOR" true)
|
||||||
(lib.cmakeBool "USE_SDL" true)
|
(lib.cmakeBool "USE_SDL" true)
|
||||||
(lib.cmakeBool "WITH_LLVM" true)
|
(lib.cmakeBool "WITH_LLVM" true)
|
||||||
(lib.cmakeBool "BUILD_LLVM" false)
|
(lib.cmakeBool "BUILD_LLVM" false)
|
||||||
@@ -130,6 +134,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
libSM
|
libSM
|
||||||
opencv.cxxdev
|
opencv.cxxdev
|
||||||
cubeb
|
cubeb
|
||||||
|
miniupnpc
|
||||||
|
rtmidi
|
||||||
|
asmjit
|
||||||
|
glslang
|
||||||
|
zstd
|
||||||
|
hidapi
|
||||||
|
vulkan-memory-allocator
|
||||||
]
|
]
|
||||||
++ lib.optional faudioSupport faudio
|
++ lib.optional faudioSupport faudio
|
||||||
++ lib.optionals waylandSupport [
|
++ lib.optionals waylandSupport [
|
||||||
|
|||||||
Reference in New Issue
Block a user