diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff b/nixpkgs/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff new file mode 100644 index 000000000000..648cecd918e8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff @@ -0,0 +1,16 @@ +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() ) + |