diff --git a/flake.nix b/flake.nix index a0b2350..e832717 100644 --- a/flake.nix +++ b/flake.nix @@ -38,10 +38,6 @@ url = "github:makuto/auto-base16-theme"; flake = false; }; - sunshine = { - url = "git+ssh://git@github.com/loki-47-6F-64/sunshine.git?submodules=true"; - flake = false; - }; }; outputs = { self, nixpkgs, ... }@inputs: { diff --git a/home-manager/modules/gaming.nix b/home-manager/modules/gaming.nix index 9fa530c..35e85f1 100644 --- a/home-manager/modules/gaming.nix +++ b/home-manager/modules/gaming.nix @@ -4,20 +4,21 @@ with lib; let cfg = config.gaming; + sunshineSrc = pkgs.fetchFromGitHub { + owner = "loki-47-6F-64"; + repo = "sunshine"; + rev = "e4c9c292e57d39136df2d46d1e9b66eba53f3bd3"; + sha256 = "sha256-YrQHHpw7GOcdlnyJI28VShYFrTRq7kpILnkyCYf77NE="; + fetchSubmodules = true; + }; + sunshineAssets = pkgs.runCommandNoCC "sunshine-assets" { } '' - cp -r ${inputs.sunshine}/assets $out + cp -r ${sunshineSrc}/assets $out ''; sunshine = pkgs.stdenv.mkDerivation { name = "sunshine"; - # src = inputs.sunshine; - src = pkgs.fetchFromGitHub { - owner = "loki-47-6F-64"; - repo = "sunshine"; - rev = "e4c9c292e57d39136df2d46d1e9b66eba53f3bd3"; - sha256 = "sha256-YrQHHpw7GOcdlnyJI28VShYFrTRq7kpILnkyCYf77NE="; - fetchSubmodules = true; - }; + src = sunshineSrc; cmakeFlags = [ "-DSUNSHINE_ASSETS_DIR=assets" "-DSUNSHINE_DEFAULT_DIR=${sunshineAssets}" ]; @@ -42,6 +43,7 @@ let hardeningDisable = [ "format" ]; buildInputs = with pkgs; [ + icu openssl (boost.override { enableShared = false; enableStatic = true; }) wayland