goverlay: move to pkgs/by-name
, link libGL, and distro info fix (#379786)
This commit is contained in:
commit
82179fe8d6
@ -20122,6 +20122,12 @@
|
|||||||
githubId = 69053978;
|
githubId = 69053978;
|
||||||
name = "rogarb";
|
name = "rogarb";
|
||||||
};
|
};
|
||||||
|
RoGreat = {
|
||||||
|
email = "roguegreat@gmail.com";
|
||||||
|
github = "RoGreat";
|
||||||
|
githubId = 64620440;
|
||||||
|
name = "RoGreat";
|
||||||
|
};
|
||||||
rohanssrao = {
|
rohanssrao = {
|
||||||
email = "rohanssrao@gmail.com";
|
email = "rohanssrao@gmail.com";
|
||||||
github = "rohanssrao";
|
github = "rohanssrao";
|
||||||
|
@ -12,17 +12,16 @@
|
|||||||
libGL,
|
libGL,
|
||||||
libGLU,
|
libGLU,
|
||||||
libnotify,
|
libnotify,
|
||||||
libqtpas,
|
|
||||||
libX11,
|
libX11,
|
||||||
|
lsb-release,
|
||||||
nix-update-script,
|
nix-update-script,
|
||||||
polkit,
|
polkit,
|
||||||
procps,
|
procps,
|
||||||
qt6,
|
qt6Packages,
|
||||||
systemd,
|
systemd,
|
||||||
util-linux,
|
util-linux,
|
||||||
vulkan-tools,
|
vulkan-tools,
|
||||||
which,
|
which,
|
||||||
wrapQtAppsHook,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -48,24 +47,26 @@ stdenv.mkDerivation rec {
|
|||||||
substituteInPlace overlayunit.pas \
|
substituteInPlace overlayunit.pas \
|
||||||
--replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \
|
--replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \
|
||||||
--replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \
|
--replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \
|
||||||
--replace-fail '/bin/bash' "${lib.getExe' bash "bash"}"
|
--replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \
|
||||||
|
--replace-fail '/usr/lib/os-release' '/etc/os-release' \
|
||||||
|
--replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
fpc
|
fpc
|
||||||
lazarus-qt6
|
lazarus-qt6
|
||||||
wrapQtAppsHook
|
qt6Packages.wrapQtAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libGL
|
libGL
|
||||||
libGLU
|
libGLU
|
||||||
libqtpas
|
qt6Packages.libqtpas
|
||||||
libX11
|
libX11
|
||||||
qt6.qtbase
|
qt6Packages.qtbase
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";
|
NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}";
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
@ -89,10 +90,6 @@ stdenv.mkDerivation rec {
|
|||||||
which
|
which
|
||||||
]
|
]
|
||||||
}"
|
}"
|
||||||
|
|
||||||
# Force xcb since libqt5pas doesn't support Wayland
|
|
||||||
# See https://github.com/benjamimgois/goverlay/issues/107
|
|
||||||
"--set QT_QPA_PLATFORM xcb"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
@ -101,7 +98,7 @@ stdenv.mkDerivation rec {
|
|||||||
description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays";
|
description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays";
|
||||||
homepage = "https://github.com/benjamimgois/goverlay";
|
homepage = "https://github.com/benjamimgois/goverlay";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ RoGreat ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
mainProgram = "goverlay";
|
mainProgram = "goverlay";
|
||||||
};
|
};
|
@ -3475,10 +3475,6 @@ with pkgs;
|
|||||||
|
|
||||||
gdown = with python3Packages; toPythonApplication gdown;
|
gdown = with python3Packages; toPythonApplication gdown;
|
||||||
|
|
||||||
goverlay = qt6Packages.callPackage ../tools/graphics/goverlay {
|
|
||||||
inherit (qt6Packages) libqtpas wrapQtAppsHook;
|
|
||||||
};
|
|
||||||
|
|
||||||
gpt4all-cuda = gpt4all.override {
|
gpt4all-cuda = gpt4all.override {
|
||||||
cudaSupport = true;
|
cudaSupport = true;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user