From eb845bbbd29ff2f05f8a47f51304dfaa834f959e Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:09:40 -0600 Subject: [PATCH] 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 { };