diff --git a/features/gaming.nix b/features/gaming.nix index 5843ece..496cb5d 100644 --- a/features/gaming.nix +++ b/features/gaming.nix @@ -1,8 +1,9 @@ { lib, pkgs, localPackages, ... }: { - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs; with localPackages.x86_64-linux; [ protonup-qt vesktop - localPackages.x86_64-linux.gamescope + lutris + gamescope-old ]; programs.steam = { diff --git a/flake.nix b/flake.nix index 073b3ba..ba2f0b9 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ in { kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix { }; - gamescope = pkgs.callPackage ./pkgs/gamescope {}; + gamescope-old = pkgs.callPackage ./pkgs/gamescope-old {}; } ); }; diff --git a/pkgs/gamescope/default.nix b/pkgs/gamescope-old/default.nix similarity index 91% rename from pkgs/gamescope/default.nix rename to pkgs/gamescope-old/default.nix index d491f1c..a4ad2f3 100644 --- a/pkgs/gamescope/default.nix +++ b/pkgs/gamescope-old/default.nix @@ -68,15 +68,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/reshade_effect_manager.cpp --replace "@out@" "$out" ''; + mesonFlags = [ (lib.mesonBool "enable_gamescope" enableExecutable) (lib.mesonBool "enable_gamescope_wsi_layer" enableWsi) - "-Dc_args=-fno-omit-frame-pointer" - "-Dc_link_args=-fno-omit-frame-pointer" - "-Dcpp_args=-fno-omit-frame-pointer" - "-Dcpp_link_args=-fno-omit-frame-pointer" - "--buildtype=debugoptimized" - "-Db_sanitize=address,undefined" ]; # don't install vendored vkroots etc @@ -137,7 +132,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString enableExecutable '' # using patchelf unstable because the stable version corrupts the binary ${lib.getExe patchelfUnstable} $out/bin/gamescope \ - --add-rpath ${vulkan-loader}/lib --add-needed libvulkan.so.1 + --add-rpath ${vulkan-loader}/lib \ + --add-needed libvulkan.so.1 \ # --debug-layers flag expects these in the path wrapProgram "$out/bin/gamescope" \ diff --git a/pkgs/gamescope/shaders-path.patch b/pkgs/gamescope-old/shaders-path.patch similarity index 100% rename from pkgs/gamescope/shaders-path.patch rename to pkgs/gamescope-old/shaders-path.patch diff --git a/pkgs/gamescope/use-pkgconfig.patch b/pkgs/gamescope-old/use-pkgconfig.patch similarity index 100% rename from pkgs/gamescope/use-pkgconfig.patch rename to pkgs/gamescope-old/use-pkgconfig.patch diff --git a/pkgs/gamescope/flake.nix b/pkgs/gamescope/flake.nix deleted file mode 100644 index a10c474..0000000 --- a/pkgs/gamescope/flake.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - }; - - outputs = {self, nixpkgs}: - let - pkgs = nixpkgs.legacyPackages; - in - pkgs.callPackage ./. {}; -}