diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-09 18:01:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 18:01:23 +0000 |
| commit | 7414a16ee558f0f04700234a83c39cf7870024ff (patch) | |
| tree | ae3f92b7a903c21a8b58dfc7801c03cfbcd50e71 /pkgs/tools/graphics | |
| parent | 432b8ab9991d7085db4cb24072b8f0dc2b8e4ce2 (diff) | |
| parent | d03f3d952484d3558888dac618d3766582dd650a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/goverlay/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/graphics/goverlay/find-xdg-data-files.patch | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index daddc4947df5..b8cd6df4751f 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -17,6 +17,7 @@ , polkit , procps , systemd +, util-linux , vulkan-tools , which }: @@ -35,13 +36,13 @@ let ''; in stdenv.mkDerivation rec { pname = "goverlay"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - hash = "sha256-ZksQse0xWAtH+U6EjcGWT2BOG5dfSnm6XvZLLE5ynHs="; + sha256 = "sha256-xuv7u2lLQAB0Zmu7UHGXP/sJwcb8vHDf9hFL+pF+818="; }; outputs = [ "out" "man" ]; @@ -91,6 +92,7 @@ in stdenv.mkDerivation rec { polkit procps systemd + util-linux.bin vulkan-tools which ]}" diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch index e29507980adb..96970cd769a1 100644 --- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -1,8 +1,8 @@ diff --git a/overlayunit.pas b/overlayunit.pas -index a56cea7..9a4f547 100644 +index 8c2276d..a62e60a 100644 --- a/overlayunit.pas +++ b/overlayunit.pas -@@ -4880,7 +4880,7 @@ begin +@@ -4913,7 +4913,7 @@ begin //Determine Mangohud dependency status //locate MangoHud and store result in tmp folder @@ -11,7 +11,7 @@ index a56cea7..9a4f547 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); -@@ -4889,7 +4889,7 @@ begin +@@ -4922,7 +4922,7 @@ begin CloseFile(mangohudVAR); // Read String and store value on mangohuddependencyVALUE based on result @@ -20,7 +20,7 @@ index a56cea7..9a4f547 100644 mangohuddependencyVALUE := 1 else mangohuddependencyVALUE := 0; -@@ -4898,7 +4898,7 @@ begin +@@ -4931,7 +4931,7 @@ begin //Determine vkBasalt dependency staus //locate vkBasalt and store result in tmp folder @@ -29,7 +29,7 @@ index a56cea7..9a4f547 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); -@@ -4907,7 +4907,7 @@ begin +@@ -4940,7 +4940,7 @@ begin CloseFile(vkbasaltVAR); // Read String and store value on vkbasaltdependencyVALUE based on result |