Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fex: init at 2412 #352205

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,13 @@
githubId = 638836;
name = "Andreas Rammhold";
};
andre4ik3 = {
name = "andre4ik3";
email = "[email protected]";
matrix = "@andre4ik3:matrix.org";
github = "andre4ik3";
githubId = 62390580;
};
andreasfelix = {
email = "[email protected]";
github = "andreasfelix";
Expand Down
80 changes: 80 additions & 0 deletions pkgs/by-name/fe/fex/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
fetchFromGitHub,
lib,
llvmPackages,
cmake,
ninja,
pkg-config,
gitMinimal,
qt5,
python3,
}:

llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
pname = "fex";
version = "2412";

src = fetchFromGitHub {
owner = "FEX-Emu";
repo = "FEX";
tag = "FEX-${version}";
hash = "sha256-VwcfxdRMjE/yoe5q0p3j4FdEMOJdtq17moxiGWO+CN0=";
fetchSubmodules = true;
};

patches = [
# This is a workaround to get FEX working with NixOS's slightly weird binfmt
# infrastructure.
./realpath.patch
];

nativeBuildInputs = [
cmake
ninja
pkg-config
gitMinimal
qt5.wrapQtAppsHook
llvmPackages.bintools

(python3.withPackages (
pythonPackages: with pythonPackages; [
setuptools
libclang
]
))
];

buildInputs = with qt5; [
qtbase
qtdeclarative
qtquickcontrols
qtquickcontrols2
];

cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DUSE_LINKER=lld"
"-DENABLE_LTO=True"
"-DENABLE_ASSERTIONS=False"
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];

strictDeps = true;
doCheck = false; # broken on Apple silicon computers

# Avoid wrapping anything other than FEXConfig, since the wrapped executables
# don't seem to work when registered as binfmts.
dontWrapQtApps = true;
preFixup = ''
wrapQtApp $out/bin/FEXConfig
'';

meta = {
description = "Fast usermode x86 and x86-64 emulator for Arm64 Linux";
homepage = "https://fex-emu.com/";
platforms = [ "aarch64-linux" ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ andre4ik3 ];
andre4ik3 marked this conversation as resolved.
Show resolved Hide resolved
mainProgram = "FEXBash";
};
})
19 changes: 19 additions & 0 deletions pkgs/by-name/fe/fex/realpath.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
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)) {
Loading