diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/development/libraries/wayqt | |
parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/wayqt')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/wayqt/default.nix | 61 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/wayqt/fix-qtwayland-header-path.diff | 16 |
2 files changed, 77 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/wayqt/default.nix b/nixpkgs/pkgs/development/libraries/wayqt/default.nix new file mode 100644 index 000000000000..47e11c9f10d0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/wayqt/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, fetchFromGitLab +, substituteAll +, meson +, pkg-config +, qttools +, ninja +, qtbase +, qtwayland +, wayland +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wayqt"; + version = "0.2.0"; + + src = fetchFromGitLab { + owner = "desktop-frameworks"; + repo = "wayqt"; + rev = "v${finalAttrs.version}"; + hash = "sha256-qlRRkqhKlcsd9lzlqfE0V0gjudELyENu4IH1NfO/+pI="; + }; + + patches = [ + # qmake get qtbase's path, but wayqt need qtwayland + (substituteAll { + src = ./fix-qtwayland-header-path.diff; + qtWaylandPath = "${qtwayland}/include"; + }) + ]; + + nativeBuildInputs = [ + meson + pkg-config + qttools + ninja + ]; + + buildInputs = [ + qtbase + qtwayland + wayland + ]; + + mesonFlags = [ + "-Duse_qt_version=qt6" + ]; + + dontWrapQtApps = true; + + outputs = [ "out" "dev" ]; + + meta = { + homepage = "https://gitlab.com/desktop-frameworks/wayqt"; + description = "Qt-based library to handle Wayland and Wlroots protocols to be used with any Qt project"; + maintainers = with lib.maintainers; [ rewine ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + }; +}) 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() ) + |