Skip to content

Commit 82179fe

Browse files
authored
goverlay: move to pkgs/by-name, link libGL, and distro info fix (#379786)
2 parents 5a1c9c4 + b6fe99d commit 82179fe

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

maintainers/maintainer-list.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20122,6 +20122,12 @@
2012220122
githubId = 69053978;
2012320123
name = "rogarb";
2012420124
};
20125+
RoGreat = {
20126+
email = "[email protected]";
20127+
github = "RoGreat";
20128+
githubId = 64620440;
20129+
name = "RoGreat";
20130+
};
2012520131
rohanssrao = {
2012620132
email = "[email protected]";
2012720133
github = "rohanssrao";

pkgs/tools/graphics/goverlay/default.nix renamed to pkgs/by-name/go/goverlay/package.nix

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@
1212
libGL,
1313
libGLU,
1414
libnotify,
15-
libqtpas,
1615
libX11,
16+
lsb-release,
1717
nix-update-script,
1818
polkit,
1919
procps,
20-
qt6,
20+
qt6Packages,
2121
systemd,
2222
util-linux,
2323
vulkan-tools,
2424
which,
25-
wrapQtAppsHook,
2625
}:
2726

2827
stdenv.mkDerivation rec {
@@ -48,24 +47,26 @@ stdenv.mkDerivation rec {
4847
substituteInPlace overlayunit.pas \
4948
--replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \
5049
--replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \
51-
--replace-fail '/bin/bash' "${lib.getExe' bash "bash"}"
50+
--replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \
51+
--replace-fail '/usr/lib/os-release' '/etc/os-release' \
52+
--replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null"
5253
'';
5354

5455
nativeBuildInputs = [
5556
fpc
5657
lazarus-qt6
57-
wrapQtAppsHook
58+
qt6Packages.wrapQtAppsHook
5859
];
5960

6061
buildInputs = [
6162
libGL
6263
libGLU
63-
libqtpas
64+
qt6Packages.libqtpas
6465
libX11
65-
qt6.qtbase
66+
qt6Packages.qtbase
6667
];
6768

68-
NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";
69+
NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}";
6970

7071
buildPhase = ''
7172
runHook preBuild
@@ -89,10 +90,6 @@ stdenv.mkDerivation rec {
8990
which
9091
]
9192
}"
92-
93-
# Force xcb since libqt5pas doesn't support Wayland
94-
# See https://github.com/benjamimgois/goverlay/issues/107
95-
"--set QT_QPA_PLATFORM xcb"
9693
];
9794

9895
passthru.updateScript = nix-update-script { };
@@ -101,7 +98,7 @@ stdenv.mkDerivation rec {
10198
description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays";
10299
homepage = "https://github.com/benjamimgois/goverlay";
103100
license = licenses.gpl3Plus;
104-
maintainers = with maintainers; [ ];
101+
maintainers = with maintainers; [ RoGreat ];
105102
platforms = platforms.linux;
106103
mainProgram = "goverlay";
107104
};

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3475,10 +3475,6 @@ with pkgs;
34753475

34763476
gdown = with python3Packages; toPythonApplication gdown;
34773477

3478-
goverlay = qt6Packages.callPackage ../tools/graphics/goverlay {
3479-
inherit (qt6Packages) libqtpas wrapQtAppsHook;
3480-
};
3481-
34823478
gpt4all-cuda = gpt4all.override {
34833479
cudaSupport = true;
34843480
};

0 commit comments

Comments
 (0)