lelgenio/lsfg-vk-flake
1
0
Fork 0
mirror of https://github.com/pabloaul/lsfg-vk-flake.git synced 2025-08-27 19:06:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

default.nix: several fixes and cleanup

Browse source
This commit is contained in:
Nojus 2025-07-13 04:19:31 +02:00
parent 9b08bddd5a
commit 0413b8836c
2 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

47
default.nix
View file

@ -1,19 +1,16 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, replaceVars , replaceVars
, srcOnly
, cmake , cmake
, meson , meson
, ninja , ninja
, SDL2 , SDL2
, glslang , glslang
#, glfw
, dxvk_2
, vulkan-headers , vulkan-headers
, vulkan-loader , vulkan-loader
, pkg-config , pkg-config
, llvmPackages , llvmPackages
#, overrideCC # lto , python3
}: let }: let
peparse-git = fetchFromGitHub { peparse-git = fetchFromGitHub {
@ -24,20 +21,13 @@
fetchSubmodules = true; fetchSubmodules = true;
}; };
dxvk-git = srcOnly (dxvk_2.overrideAttrs (old: { dxvk-git = fetchFromGitHub {
src = fetchFromGitHub { owner = "doitsujin";
owner = "doitsujin"; repo = "dxvk";
repo = "dxvk"; rev = "v2.6.2";
rev = "v2.6.2"; hash = "sha256-nZEi9WYhpI0WaeguoZMV4nt+nfaErvgz5RNDyyZYCJA=";
hash = "sha256-nZEi9WYhpI0WaeguoZMV4nt+nfaErvgz5RNDyyZYCJA="; fetchSubmodules = true;
fetchSubmodules = true; };
};
}));
# stdenv_lto = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
# inherit (llvmPackages) bintools;
# });
# this causes problems with dxvk-git which does not like llvm's ar...
in llvmPackages.stdenv.mkDerivation { in llvmPackages.stdenv.mkDerivation {
pname = "lsfg-vk"; pname = "lsfg-vk";
@ -48,31 +38,28 @@ in llvmPackages.stdenv.mkDerivation {
# we need to unvendor dxvk and pe-parse which would normally be downloaded from git during buildtime in the cmakefiles # we need to unvendor dxvk and pe-parse which would normally be downloaded from git during buildtime in the cmakefiles
patches = [ patches = [
(replaceVars ./no-download.patch { (replaceVars ./no-download.patch {
dxvk-git = dxvk-git; inherit dxvk-git peparse-git python3;
peparse-git = peparse-git;
}) })
]; ];
#cmakeFlags = [ cmakeFlags = [
#"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Debug"
#"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" ];
#"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" # LTO
#];
nativeBuildInputs = [ nativeBuildInputs = [
#llvmPackages.clang-tools # https://github.com/NixOS/nixpkgs/issues/273875 # clang-tools needs to come before clang so it can locate Vulkan headers correctly
#llvmPackages.libcxxClang # LTO: "ar: error: the 'o' modifier is only applicable to the 'x' operation" llvmPackages.clang-tools
#llvmPackages.bintools # LTO: "RANLIB-NOTFOUND, AR-NOTFOUND" llvmPackages.clang
cmake cmake
meson meson
ninja ninja
pkg-config pkg-config
glslang
python3
]; ];
buildInputs = [ buildInputs = [
dxvk-git
SDL2 SDL2
glslang
vulkan-headers vulkan-headers
vulkan-loader vulkan-loader
]; ];

11
no-download.patch
View file

@ -1,8 +1,8 @@
diff --git a/cmake/FetchDXVK.cmake b/cmake/FetchDXVK.cmake diff --git a/cmake/FetchDXVK.cmake b/cmake/FetchDXVK.cmake
index f84de82..bbe9f73 100644 index f84de82..8721531 100644
--- a/cmake/FetchDXVK.cmake --- a/cmake/FetchDXVK.cmake
+++ b/cmake/FetchDXVK.cmake +++ b/cmake/FetchDXVK.cmake
@@ -9,8 +9,7 @@ else() @@ -9,12 +9,14 @@ else()
endif() endif()
ExternalProject_Add(dxvk_git ExternalProject_Add(dxvk_git
@ -12,6 +12,13 @@ index f84de82..bbe9f73 100644
UPDATE_DISCONNECTED true UPDATE_DISCONNECTED true
USES_TERMINAL_CONFIGURE true USES_TERMINAL_CONFIGURE true
USES_TERMINAL_BUILD true USES_TERMINAL_BUILD true
BUILD_IN_SOURCE true
+ PATCH_COMMAND
+ sed -i -e "s|^#!.*python3|#!@python3@/bin/python3|" <SOURCE_DIR>/subprojects/libdisplay-info/tool/gen-search-table.py &&
+ chmod +x <SOURCE_DIR>/subprojects/libdisplay-info/tool/gen-search-table.py
CONFIGURE_COMMAND
sed -i s/private://g
src/dxvk/dxvk_shader.h &&
diff --git a/cmake/FetchPeParse.cmake b/cmake/FetchPeParse.cmake diff --git a/cmake/FetchPeParse.cmake b/cmake/FetchPeParse.cmake
index df7879b..31a4b87 100644 index df7879b..31a4b87 100644
--- a/cmake/FetchPeParse.cmake --- a/cmake/FetchPeParse.cmake