Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

1 files changed, 13 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/applications/window-managers/gamescope/shaders-path.patch b/nixpkgs/pkgs/applications/window-managers/gamescope/shaders-path.patch
new file mode 100644
index 000000000000..bbdaf21a2e6f
--- /dev/null
+++ b/nixpkgs/pkgs/applications/window-managers/gamescope/shaders-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp
+index 3597ca1..de45250 100644
+--- a/src/reshade_effect_manager.cpp
++++ b/src/reshade_effect_manager.cpp
+@@ -34,7 +34,7 @@ static std::string GetLocalUsrDir()
+
+ static std::string GetUsrDir()
+ {
+-    return "/usr";
++    return "@out@";
+ }
+
+ static LogScope reshade_log("gamescope_reshade");