add icu dependency to sunshine

This commit is contained in:
notgne2 2022-01-11 14:50:24 -07:00
parent 16fe2f00c3
commit 7ff488ef2b
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
2 changed files with 11 additions and 13 deletions

View File

@ -38,10 +38,6 @@
url = "github:makuto/auto-base16-theme"; url = "github:makuto/auto-base16-theme";
flake = false; flake = false;
}; };
sunshine = {
url = "git+ssh://git@github.com/loki-47-6F-64/sunshine.git?submodules=true";
flake = false;
};
}; };
outputs = { self, nixpkgs, ... }@inputs: { outputs = { self, nixpkgs, ... }@inputs: {

View File

@ -4,14 +4,7 @@ with lib;
let let
cfg = config.gaming; cfg = config.gaming;
sunshineAssets = pkgs.runCommandNoCC "sunshine-assets" { } '' sunshineSrc = pkgs.fetchFromGitHub {
cp -r ${inputs.sunshine}/assets $out
'';
sunshine = pkgs.stdenv.mkDerivation {
name = "sunshine";
# src = inputs.sunshine;
src = pkgs.fetchFromGitHub {
owner = "loki-47-6F-64"; owner = "loki-47-6F-64";
repo = "sunshine"; repo = "sunshine";
rev = "e4c9c292e57d39136df2d46d1e9b66eba53f3bd3"; rev = "e4c9c292e57d39136df2d46d1e9b66eba53f3bd3";
@ -19,6 +12,14 @@ let
fetchSubmodules = true; fetchSubmodules = true;
}; };
sunshineAssets = pkgs.runCommandNoCC "sunshine-assets" { } ''
cp -r ${sunshineSrc}/assets $out
'';
sunshine = pkgs.stdenv.mkDerivation {
name = "sunshine";
src = sunshineSrc;
cmakeFlags = [ "-DSUNSHINE_ASSETS_DIR=assets" "-DSUNSHINE_DEFAULT_DIR=${sunshineAssets}" ]; cmakeFlags = [ "-DSUNSHINE_ASSETS_DIR=assets" "-DSUNSHINE_DEFAULT_DIR=${sunshineAssets}" ];
postPatch = '' postPatch = ''
@ -42,6 +43,7 @@ let
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
icu
openssl openssl
(boost.override { enableShared = false; enableStatic = true; }) (boost.override { enableShared = false; enableStatic = true; })
wayland wayland