From 7cdaf8261f3486603e39028c9898e6dabb4b98a8 Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Sat, 7 Mar 2026 00:58:13 +0000 Subject: [PATCH 1/2] fex: 2601 -> 2603 --- pkgs/by-name/fe/fex/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 197e3a2671a3..bc742d7689f7 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -7,6 +7,7 @@ pkg-config, python3, nix-update-script, + jemalloc, xxHash, fmt, libxml2, @@ -99,13 +100,13 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2601"; + version = "2603"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-AfHOD3S3zDwe85Zr8XEMmI+LrdVEZdXJ9FWQQ+oUNik="; + hash = "sha256-rQOqziJ7IizJV3VmAWGo5s2xn2/xnp0sx3VfBtH1JK4="; leaveDotGit = true; postFetch = '' @@ -116,10 +117,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { git submodule update --init --depth 1 \ External/Vulkan-Headers \ External/drm-headers \ - External/jemalloc \ + External/rpmalloc \ External/jemalloc_glibc \ - External/robin-map \ External/vixl \ + External/unordered_dense \ Source/Common/cpp-optparse find . -name .git -print0 | xargs -0 rm -rf @@ -132,6 +133,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { }; postPatch = '' + substituteInPlace FEXCore/include/git_version.h.in \ + --replace-fail "@GIT_HASH_ARRAY@" "" \ + --replace-fail "@GIT_DESCRIBE_STRING@" "FEX-${finalAttrs.version}" + substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \ --replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \ --replace-fail "/usr/include/wayland" "${devRootFS}/include/wayland" @@ -183,6 +188,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ++ lib.optional withQt qt6.wrapQtAppsHook; buildInputs = [ + jemalloc xxHash fmt libxml2 From 88b3bbd7a1cf3148f07da488f409979efb78c8eb Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Sat, 7 Mar 2026 02:11:37 +0000 Subject: [PATCH 2/2] fex: remove date header from manpages Closes #486904 --- pkgs/by-name/fe/fex/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index bc742d7689f7..3186c5764f49 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -149,6 +149,11 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt \ --replace-fail "-- " "-- $(cat ${llvmPackages.stdenv.cc}/nix-support/libcxx-cxxflags) " + # Disable including current date in manpages + substituteInPlace FEXCore/Scripts/config_generator.py \ + --replace-fail ".Dd {0}" ".Dd" \ + --replace-fail "output_man.write(header.format(" "output_man.write(header) #" + # Patch any references to library wrapper paths substituteInPlace FEXCore/Source/Interface/Config/Config.json.in \ --replace-fail "ThunkGuestLibs" "UnusedThunkGuestLibs" \