Unverified Commit 4c7aa249 authored by K900's avatar K900 Committed by GitHub
Browse files

gamescope: also patch script paths (#383896)

parents 3bfd0451 5e597210
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
  };

  patches = [
    # Make it look for shaders in the right place
    # Make it look for data in the right place
    ./scripts-path.patch
    ./shaders-path.patch
    # patch relative gamescopereaper path with absolute
    ./gamescopereaper.patch
@@ -69,8 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
  # so `placeholder "out"` ends up pointing to the wrong place
  postPatch = ''
    substituteInPlace src/reshade_effect_manager.cpp --replace-fail "@out@" "$out"
    substituteInPlace src/Script/Script.cpp --replace-fail "@out@" "$out"

    # Patching shebangs in the main `libdisplay-info` build
    patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py

    # Replace gamescopereeaper with absolute path
    substituteInPlace src/Utils/Process.cpp --subst-var-by "gamescopereaper" "$out/bin/gamescopereaper"
    patchShebangs default_scripts_install.sh
+13 −0
Original line number Diff line number Diff line
diff --git a/src/Script/Script.cpp b/src/Script/Script.cpp
index a104ee9..f7cfc8b 100644
--- a/src/Script/Script.cpp
+++ b/src/Script/Script.cpp
@@ -130,7 +130,7 @@ namespace gamescope
         }
         else
         {
-            RunFolder( "/usr/share/gamescope/scripts", true );
+            RunFolder( "@out@/share/gamescope/scripts", true );
             RunFolder( "/etc/gamescope/scripts", true );
         }