goverlay: move to `pkgs/by-name`, link libGL, and distro info fix (#379786)

authored by Aleksana and committed by GitHub 82179fe8 5a1c9c48

+16 -17
+6
maintainers/maintainer-list.nix
··· 20122 20122 githubId = 69053978; 20123 20123 name = "rogarb"; 20124 20124 }; 20125 + RoGreat = { 20126 + email = "roguegreat@gmail.com"; 20127 + github = "RoGreat"; 20128 + githubId = 64620440; 20129 + name = "RoGreat"; 20130 + }; 20125 20131 rohanssrao = { 20126 20132 email = "rohanssrao@gmail.com"; 20127 20133 github = "rohanssrao";
+10 -13
pkgs/tools/graphics/goverlay/default.nix pkgs/by-name/go/goverlay/package.nix
··· 12 12 libGL, 13 13 libGLU, 14 14 libnotify, 15 - libqtpas, 16 15 libX11, 16 + lsb-release, 17 17 nix-update-script, 18 18 polkit, 19 19 procps, 20 - qt6, 20 + qt6Packages, 21 21 systemd, 22 22 util-linux, 23 23 vulkan-tools, 24 24 which, 25 - wrapQtAppsHook, 26 25 }: 27 26 28 27 stdenv.mkDerivation rec { ··· 48 47 substituteInPlace overlayunit.pas \ 49 48 --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \ 50 49 --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" 52 53 ''; 53 54 54 55 nativeBuildInputs = [ 55 56 fpc 56 57 lazarus-qt6 57 - wrapQtAppsHook 58 + qt6Packages.wrapQtAppsHook 58 59 ]; 59 60 60 61 buildInputs = [ 61 62 libGL 62 63 libGLU 63 - libqtpas 64 + qt6Packages.libqtpas 64 65 libX11 65 - qt6.qtbase 66 + qt6Packages.qtbase 66 67 ]; 67 68 68 - NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; 69 + NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}"; 69 70 70 71 buildPhase = '' 71 72 runHook preBuild ··· 89 90 which 90 91 ] 91 92 }" 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" 96 93 ]; 97 94 98 95 passthru.updateScript = nix-update-script { }; ··· 101 98 description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays"; 102 99 homepage = "https://github.com/benjamimgois/goverlay"; 103 100 license = licenses.gpl3Plus; 104 - maintainers = with maintainers; [ ]; 101 + maintainers = with maintainers; [ RoGreat ]; 105 102 platforms = platforms.linux; 106 103 mainProgram = "goverlay"; 107 104 };
-4
pkgs/top-level/all-packages.nix
··· 3475 3475 3476 3476 gdown = with python3Packages; toPythonApplication gdown; 3477 3477 3478 - goverlay = qt6Packages.callPackage ../tools/graphics/goverlay { 3479 - inherit (qt6Packages) libqtpas wrapQtAppsHook; 3480 - }; 3481 - 3482 3478 gpt4all-cuda = gpt4all.override { 3483 3479 cudaSupport = true; 3484 3480 };