fex: 2502 -> 2503 (#387366)
This commit is contained in:
@@ -12,22 +12,16 @@
|
||||
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "fex";
|
||||
version = "2502";
|
||||
version = "2503";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FEX-Emu";
|
||||
repo = "FEX";
|
||||
tag = "FEX-${version}";
|
||||
hash = "sha256-w+Kqk+IQsVNbOqYDTpxDeoPyeIgqX2IfZv9zqAJEMVc=";
|
||||
hash = "sha256-NnYod6DeRv3/6h8SGkGYtgC+RRuIafxoQm3j1Sqk0mU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This is a workaround to get FEX working with NixOS's slightly weird binfmt
|
||||
# infrastructure.
|
||||
./realpath.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/Source/Common/FEXServerClient.cpp b/Source/Common/FEXServerClient.cpp
|
||||
index 424ecf0a0..501bcbac1 100644
|
||||
--- a/Source/Common/FEXServerClient.cpp
|
||||
+++ b/Source/Common/FEXServerClient.cpp
|
||||
@@ -209,7 +209,13 @@ int ConnectToAndStartServer(char* InterpreterPath) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
- fextl::string FEXServerPath = FHU::Filesystem::ParentPath(InterpreterPath) + "/FEXServer";
|
||||
+ char RealInterpreterPathBuf[PATH_MAX];
|
||||
+ char *RealInterpreterPath = realpath(InterpreterPath, RealInterpreterPathBuf);
|
||||
+ if (!RealInterpreterPath) {
|
||||
+ LogMan::Msg::EFmt("realpath failed");
|
||||
+ return -1;
|
||||
+ }
|
||||
+ fextl::string FEXServerPath = FHU::Filesystem::ParentPath(RealInterpreterPath) + "/FEXServer";
|
||||
// Check if a local FEXServer next to FEXInterpreter exists
|
||||
// If it does then it takes priority over the installed one
|
||||
if (!FHU::Filesystem::Exists(FEXServerPath)) {
|
||||
Reference in New Issue
Block a user