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

Merge pull request #326868 from devusb/gamescopereaper

gamescope: patch gamescopereaper path
parents 3ff51e1b 64d80302
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
diff --git a/src/Utils/Process.cpp b/src/Utils/Process.cpp
index 5688fb1..6cea8d8 100644
--- a/src/Utils/Process.cpp
+++ b/src/Utils/Process.cpp
@@ -392,7 +392,7 @@ namespace gamescope::Process
     pid_t SpawnProcessInWatchdog( char **argv, bool bRespawn, std::function<void()> fnPreambleInChild )
     {
         std::vector<char *> args;
-        args.push_back( (char *)"gamescopereaper" );
+        args.push_back( (char *)"@gamescopereaper@" );
         if ( bRespawn )
             args.push_back( (char *)"--respawn" );
         args.push_back( (char *)"--" );
+6 −2
Original line number Diff line number Diff line
@@ -44,19 +44,21 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "gamescope";
  version = "3.14.23";
  version = "3.14.24";

  src = fetchFromGitHub {
    owner = "ValveSoftware";
    repo = "gamescope";
    rev = "refs/tags/${finalAttrs.version}";
    fetchSubmodules = true;
    hash = "sha256-qXwCzNGlkGmO3BkQ74tJxufmjh4dUWzIgjHzDCEShU8=";
    hash = "sha256-+8uojnfx8V8BiYAeUsOaXTXrlcST83z6Eld7qv1oboE=";
  };

  patches = [
    # Make it look for shaders in the right place
    ./shaders-path.patch
    # patch relative gamescopereaper path with absolute
    ./gamescopereaper.patch
  ];

  # We can't substitute the patch itself because substituteAll is itself a derivation,
@@ -65,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace src/reshade_effect_manager.cpp --replace "@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"
  '';

  mesonFlags = [