git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #137011 from kira-bruneau/goverlay
commit50f4571c35af36ddcb1f0776ca0c683411139be4 authorArtturi <Artturin@artturin.com> dateSun 31 Oct 2021, 19:32 (5 years ago) parent4bb4e58f70fdcd
3 files changed+19−15
compare with master
unifiedsplit
pkgs/tools/graphics/goverlay/default.nix+11−9 pkgs/tools/graphics/goverlay/find-xdg-data-files.patch+5−5 pkgs/top-level/all-packages.nix+3−1
pkgs/tools/graphics/goverlay/default.nix+11−9
@@ -5,14 +5,15 @@
55, fetchFromGitHub
66, fpc
77, lazarus-qt
8−, qt5
9−, libX11
8+, wrapQtAppsHook
9+, libGL
10+, libGLU
1011, libqt5pas
12+, libX11
1113, coreutils
1214, git
1315, gnugrep
1416, libnotify
15−, mesa-demos
1617, polkit
1718, procps
1819, systemd
@@ -34,13 +35,13 @@ let
3435 '';
3536in stdenv.mkDerivation rec {
3637 pname = "goverlay";
37− version = "0.6";
38+ version = "0.6.3";
3839
3940 src = fetchFromGitHub {
4041 owner = "benjamimgois";
4142 repo = pname;
4243 rev = version;
43− hash = "sha256-E4SMUL9rpDSSdprX4fPyGCHCowdQavjhGIhV3r4jeiw=";
44+ hash = "sha256-ZksQse0xWAtH+U6EjcGWT2BOG5dfSnm6XvZLLE5ynHs=";
4445 };
4546
4647 outputs = [ "out" "man" ];
@@ -61,15 +62,17 @@ in stdenv.mkDerivation rec {
6162 nativeBuildInputs = [
6263 fpc
6364 lazarus-qt
64− qt5.wrapQtAppsHook
65+ wrapQtAppsHook
6566 ];
6667
6768 buildInputs = [
68− libX11
69+ libGL
70+ libGLU
6971 libqt5pas
72+ libX11
7073 ];
7174
72− NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
75+ NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";
7376
7477 buildPhase = ''
7578 runHook preBuild
@@ -85,7 +88,6 @@ in stdenv.mkDerivation rec {
8588 git
8689 gnugrep
8790 libnotify
88− mesa-demos
8991 polkit
9092 procps
9193 systemd
pkgs/tools/graphics/goverlay/find-xdg-data-files.patch+5−5
@@ -1,8 +1,8 @@
11diff --git a/overlayunit.pas b/overlayunit.pas
2−index de8725f..005f171 100644
2+index a56cea7..9a4f547 100644
33--- a/overlayunit.pas
44+++ b/overlayunit.pas
5−@@ -5377,7 +5377,7 @@ begin
5+@@ -4880,7 +4880,7 @@ begin
66 //Determine Mangohud dependency status
77
88 //locate MangoHud and store result in tmp folder
@@ -11,7 +11,7 @@ index de8725f..005f171 100644
1111
1212 // Assign Text file dependency_mangohud to variable mangohudVAR
1313 AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud');
14−@@ -5386,7 +5386,7 @@ begin
14+@@ -4889,7 +4889,7 @@ begin
1515 CloseFile(mangohudVAR);
1616
1717 // Read String and store value on mangohuddependencyVALUE based on result
@@ -20,7 +20,7 @@ index de8725f..005f171 100644
2020 mangohuddependencyVALUE := 1
2121 else
2222 mangohuddependencyVALUE := 0;
23−@@ -5395,7 +5395,7 @@ begin
23+@@ -4898,7 +4898,7 @@ begin
2424 //Determine vkBasalt dependency staus
2525
2626 //locate vkBasalt and store result in tmp folder
@@ -29,7 +29,7 @@ index de8725f..005f171 100644
2929
3030 // Assign Text file dependency_mangohud to variable mangohudVAR
3131 AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt');
32−@@ -5404,7 +5404,7 @@ begin
32+@@ -4907,7 +4907,7 @@ begin
3333 CloseFile(vkbasaltVAR);
3434
3535 // Read String and store value on vkbasaltdependencyVALUE based on result
pkgs/top-level/all-packages.nix+3−1
@@ -5846,7 +5846,9 @@ with pkgs;
58465846
58475847 govc = callPackage ../tools/virtualization/govc { };
58485848
5849− goverlay = callPackage ../tools/graphics/goverlay { };
5849+ goverlay = callPackage ../tools/graphics/goverlay {
5850+ inherit (qt5) wrapQtAppsHook;
5851+ };
58505852
58515853 gpart = callPackage ../tools/filesystems/gpart { };
58525854