b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #137011 from kira-bruneau/goverlay

Browse source
This commit is contained in:
Artturi 2021-10-31 19:32:52 +02:00 committed by GitHub
parent 4bb4e58849 f70fdcd91b
commit 50f4571c35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/tools/graphics/goverlay/default.nix
View file

@ -5,14 +5,15 @@
, fetchFromGitHub , fetchFromGitHub
, fpc , fpc
, lazarus-qt , lazarus-qt
, qt5 , wrapQtAppsHook
, libX11 , libGL
, libGLU
, libqt5pas , libqt5pas
, libX11
, coreutils , coreutils
, git , git
, gnugrep , gnugrep
, libnotify , libnotify
, mesa-demos
, polkit , polkit
, procps , procps
, systemd , systemd
@ -34,13 +35,13 @@ let
''; '';
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "goverlay"; pname = "goverlay";
version = "0.6"; version = "0.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "benjamimgois"; owner = "benjamimgois";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-E4SMUL9rpDSSdprX4fPyGCHCowdQavjhGIhV3r4jeiw="; hash = "sha256-ZksQse0xWAtH+U6EjcGWT2BOG5dfSnm6XvZLLE5ynHs=";
}; };
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -61,15 +62,17 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
fpc fpc
lazarus-qt lazarus-qt
qt5.wrapQtAppsHook wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
libX11 libGL
libGLU
libqt5pas libqt5pas
libX11
]; ];
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
@ -85,7 +88,6 @@ in stdenv.mkDerivation rec {
git git
gnugrep gnugrep
libnotify libnotify
mesa-demos
polkit polkit
procps procps
systemd systemd

10
pkgs/tools/graphics/goverlay/find-xdg-data-files.patch
View file

@ -1,8 +1,8 @@
diff --git a/overlayunit.pas b/overlayunit.pas diff --git a/overlayunit.pas b/overlayunit.pas
index de8725f..005f171 100644 index a56cea7..9a4f547 100644
--- a/overlayunit.pas --- a/overlayunit.pas
+++ b/overlayunit.pas +++ b/overlayunit.pas
@@ -5377,7 +5377,7 @@ begin @@ -4880,7 +4880,7 @@ begin
//Determine Mangohud dependency status //Determine Mangohud dependency status
//locate MangoHud and store result in tmp folder //locate MangoHud and store result in tmp folder
@ -11,7 +11,7 @@ index de8725f..005f171 100644
// Assign Text file dependency_mangohud to variable mangohudVAR // Assign Text file dependency_mangohud to variable mangohudVAR
AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud');
@@ -5386,7 +5386,7 @@ begin @@ -4889,7 +4889,7 @@ begin
CloseFile(mangohudVAR); CloseFile(mangohudVAR);
// Read String and store value on mangohuddependencyVALUE based on result // Read String and store value on mangohuddependencyVALUE based on result
@ -20,7 +20,7 @@ index de8725f..005f171 100644
mangohuddependencyVALUE := 1 mangohuddependencyVALUE := 1
else else
mangohuddependencyVALUE := 0; mangohuddependencyVALUE := 0;
@@ -5395,7 +5395,7 @@ begin @@ -4898,7 +4898,7 @@ begin
//Determine vkBasalt dependency staus //Determine vkBasalt dependency staus
//locate vkBasalt and store result in tmp folder //locate vkBasalt and store result in tmp folder
@ -29,7 +29,7 @@ index de8725f..005f171 100644
// Assign Text file dependency_mangohud to variable mangohudVAR // Assign Text file dependency_mangohud to variable mangohudVAR
AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt');
@@ -5404,7 +5404,7 @@ begin @@ -4907,7 +4907,7 @@ begin
CloseFile(vkbasaltVAR); CloseFile(vkbasaltVAR);
// Read String and store value on vkbasaltdependencyVALUE based on result // Read String and store value on vkbasaltdependencyVALUE based on result

4
pkgs/top-level/all-packages.nix
View file

@ -5846,7 +5846,9 @@ with pkgs;
govc = callPackage ../tools/virtualization/govc { }; govc = callPackage ../tools/virtualization/govc { };
goverlay = callPackage ../tools/graphics/goverlay { }; goverlay = callPackage ../tools/graphics/goverlay {
inherit (qt5) wrapQtAppsHook;
};
gpart = callPackage ../tools/filesystems/gpart { }; gpart = callPackage ../tools/filesystems/gpart { };