From fe9997ca181a06333352d1efbc0f4d250037fd57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Kurucz?= Date: Wed, 5 Mar 2025 20:22:13 +0100 Subject: [PATCH] fex: 2502 -> 2503 --- pkgs/by-name/fe/fex/package.nix | 10 ++-------- pkgs/by-name/fe/fex/realpath.patch | 19 ------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 pkgs/by-name/fe/fex/realpath.patch diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 6aea2949863f..af2aac3602f2 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -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 diff --git a/pkgs/by-name/fe/fex/realpath.patch b/pkgs/by-name/fe/fex/realpath.patch deleted file mode 100644 index 51cf02d426dc..000000000000 --- a/pkgs/by-name/fe/fex/realpath.patch +++ /dev/null @@ -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)) {