peperunas/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sunshine: fixed resolution script invocation, use fixed fork for framepacing

Browse Source
This commit is contained in:
Giulio De Pasquale 2024-04-02 16:41:15 +01:00
parent 16a70daa33
commit ed70646087
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hosts/architect/sunshine-ui.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/cmake/targets/unix.cmake b/cmake/targets/unix.cmake
index 2ce0378..cdbf65c 100644
--- a/cmake/targets/unix.cmake
+++ b/cmake/targets/unix.cmake
@@ -2,7 +2,7 @@
# put anything here that applies to both linux and macos
#WebUI build
-add_custom_target(web-ui ALL
- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
- COMMENT "Installing NPM Dependencies and Building the Web UI"
- COMMAND bash -c \"npm install && SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW} SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR} npm run build\") # cmake-lint: disable=C0301
+# add_custom_target(web-ui ALL
+# WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+# COMMENT "Installing NPM Dependencies and Building the Web UI"
+# COMMAND bash -c \"npm install && SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW} SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR} npm run build\") # cmake-lint: disable=C0301

21
hosts/architect/sunshine.nix
View File

@ -16,8 +16,8 @@ let
text = '' text = ''
#!${pkgs.bash}/bin/bash #!${pkgs.bash}/bin/bash
width=''${1:-1920} width=''${1:-1280}
height=''${2:-1080} height=''${2:-720}
refresh_rate=''${3:-120} refresh_rate=''${3:-120}
# Get the modeline info from the 2nd row in the cvt output # Get the modeline info from the 2nd row in the cvt output
@ -48,9 +48,22 @@ let
origin_web_ui_allowed=lan origin_web_ui_allowed=lan
channels=2 channels=2
min_threads=12 min_threads=12
global_prep_cmd=[{"do":"${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT} ''${SUNSHINE_CLIENT_FPS}"}]
global_prep_cmd=[{"do":"${pkgs.bash}/bin/bash -c \"${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT} ''${SUNSHINE_CLIENT_FPS}\""}]
''; '';
sunshinePkg = pkgs.unstablePkgs.sunshine.override { cudaSupport = true; }; sunshinePkg = (pkgs.unstablePkgs.sunshine.override { cudaSupport = true; }).overrideAttrs (old: {
version = "0.22.2-fix";
src = pkgs.fetchFromGitHub {
owner = "gschintgen";
repo = "Sunshine";
rev = "985561c5cfe0934662a90f9b6c406e3f3e981d59";
sha256 = "sha256-APfwDkVG1uYvfqxNjNxGEofDd4H0QAk5fzAKG6IW+CI=";
fetchSubmodules = true;
};
patches = [./sunshine-ui.patch];
buildInputs = old.buildInputs ++ [pkgs.python311];
});
in in
{ {
boot.kernelModules = [ "uinput" ]; boot.kernelModules = [ "uinput" ];