wayqt: 0.3.0 -> 0.3.0-unstable-2026-01-05 (#479054)
This commit is contained in:
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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() )
|
||||
|
||||
Reference in New Issue
Block a user