From a712f33b347882b447b908ed67ee98b32d2e9b7d Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sun, 11 Jan 2026 12:13:09 -0300 Subject: [PATCH] wayqt: 0.3.0 -> 0.3.0-unstable-2026-01-05 --- pkgs/by-name/qt/qtgreet/package.nix | 2 ++ pkgs/development/libraries/wayqt/default.nix | 13 +++---------- .../wayqt/fix-qtwayland-header-path.diff | 16 ---------------- 3 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff diff --git a/pkgs/by-name/qt/qtgreet/package.nix b/pkgs/by-name/qt/qtgreet/package.nix index 40068bec30ec..508e4a5f4d23 100644 --- a/pkgs/by-name/qt/qtgreet/package.nix +++ b/pkgs/by-name/qt/qtgreet/package.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet") ]; + NIX_LDFLAGS = "-lwayqt-utils-qt6"; + meta = { description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors"; homepage = "https://gitlab.com/marcusbritanicus/QtGreet"; diff --git a/pkgs/development/libraries/wayqt/default.nix b/pkgs/development/libraries/wayqt/default.nix index a48742949554..215c1b3c558f 100644 --- a/pkgs/development/libraries/wayqt/default.nix +++ b/pkgs/development/libraries/wayqt/default.nix @@ -13,22 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayqt"; - version = "0.3.0"; + version = "0.3.0-unstable-2026-01-05"; src = fetchFromGitLab { owner = "desktop-frameworks"; repo = "wayqt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-FPyHm96LYCTqMZlPrZoSPMeyocDjaCnaYJETH/nazBU="; + rev = "2750cd93a3110bff6345f9e2a1a3090a3e3f7203"; + hash = "sha256-WGIZ3OgeGkQWEzc/m0/Moo9Qgr3vg4dFfQhba2vx0do="; }; - patches = [ - # qmake get qtbase's path, but wayqt need qtwayland - (replaceVars ./fix-qtwayland-header-path.diff { - qtWaylandPath = "${qtwayland}/include"; - }) - ]; - nativeBuildInputs = [ meson pkg-config diff --git a/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff b/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff deleted file mode 100644 index 648cecd918e8..000000000000 --- a/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/meson.build b/meson.build -index 5c09644..fc65d37 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,9 +39,8 @@ elif get_option('use_qt_version') == 'qt6' - private_headers: [ 'Gui', 'WaylandClient', 'WaylandGlobalPrivate' ], - ) - -- qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: true ) -- ret = run_command( qmake, '-query', 'QT_INSTALL_HEADERS', check: true ) -- QtHeaderPath = ret.stdout().strip() -+ qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: false ) -+ QtHeaderPath = '@qtWaylandPath@' - - QtGlobal = '@0@/QtWaylandGlobal/@1@'.format( QtHeaderPath, QtDeps.version() ) -