From 4a43c439aed1b1dd75c5727865bbb38778924017 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:06:12 -0600 Subject: [PATCH 1/5] goverlay: move to `pkgs/by-name` --- .../goverlay/default.nix => by-name/go/goverlay/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{tools/graphics/goverlay/default.nix => by-name/go/goverlay/package.nix} (100%) diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/by-name/go/goverlay/package.nix similarity index 100% rename from pkgs/tools/graphics/goverlay/default.nix rename to pkgs/by-name/go/goverlay/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5745a474153..77a80db8782c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3487,10 +3487,6 @@ with pkgs; gdown = with python3Packages; toPythonApplication gdown; - goverlay = qt6Packages.callPackage ../tools/graphics/goverlay { - inherit (qt6Packages) libqtpas wrapQtAppsHook; - }; - gpt4all-cuda = gpt4all.override { cudaSupport = true; }; From dd8b25abd71a7d0813d8da446ca00fe3c0fd3480 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:06:33 -0600 Subject: [PATCH 2/5] maintainers: add RoGreat --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/go/goverlay/package.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5570d588f74a..b8f67fd8ffd4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19948,6 +19948,12 @@ githubId = 69053978; name = "rogarb"; }; + RoGreat = { + email = "roguegreat@gmail.com"; + github = "RoGreat"; + githubId = 64620440; + name = "RoGreat"; + }; rohanssrao = { email = "rohanssrao@gmail.com"; github = "rohanssrao"; diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index b59d5de8ac3c..ad6550692c68 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays"; homepage = "https://github.com/benjamimgois/goverlay"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ RoGreat ]; platforms = platforms.linux; mainProgram = "goverlay"; }; From eb845bbbd29ff2f05f8a47f51304dfaa834f959e Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:09:40 -0600 Subject: [PATCH 3/5] goverlay: qt6Packages --- pkgs/by-name/go/goverlay/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index ad6550692c68..db9051fe10b4 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -12,17 +12,15 @@ libGL, libGLU, libnotify, - libqtpas, libX11, nix-update-script, polkit, procps, - qt6, + qt6Packages, systemd, util-linux, vulkan-tools, which, - wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -54,15 +52,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fpc lazarus-qt6 - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = [ libGL libGLU - libqtpas + qt6Packages.libqtpas libX11 - qt6.qtbase + qt6Packages.qtbase ]; NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; @@ -89,10 +87,6 @@ stdenv.mkDerivation rec { 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 { }; From 8a5a751302ead877db4258fcbe4181f8bd4ff250 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:20:11 -0600 Subject: [PATCH 4/5] goverlay: link libGL --- pkgs/by-name/go/goverlay/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index db9051fe10b4..fe52673ef1ea 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { qt6Packages.qtbase ]; - NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; + NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' runHook preBuild From b6fe99db9f128e8f9a92da5d635b9280970549f9 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:55:34 -0600 Subject: [PATCH 5/5] goverlay: distro info --- pkgs/by-name/go/goverlay/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index fe52673ef1ea..4e4e6f90028c 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -13,6 +13,7 @@ libGLU, libnotify, libX11, + lsb-release, nix-update-script, polkit, procps, @@ -46,7 +47,9 @@ stdenv.mkDerivation rec { substituteInPlace overlayunit.pas \ --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 '/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 = [