diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-01-10 17:01:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-10 17:01:22 +0100 |
| commit | 0c7cc93361cb0462abebea439783e348ad7f04aa (patch) | |
| tree | 3976e838bb3fcd2acd8d1776c5c0388a36690d5a /pkgs/data | |
| parent | 46d6a8f05bafb5b260324ccb40c7221bb11faa29 (diff) | |
| parent | a2e21c76c7d31d8f54a564c49ad3ef54d76fc1e4 (diff) | |
Merge pull request #182580 from linsui/qgnomeplatform
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/themes/adwaita-qt/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 79690fa4e6af..2a5d768b1ae3 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -1,16 +1,17 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , nix-update-script , cmake , ninja , qtbase +, qtwayland , qt5 , xorg +, useQt6 ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "adwaita-qt"; version = "1.4.1"; @@ -30,9 +31,19 @@ mkDerivation rec { buildInputs = [ qtbase - qt5.qtx11extras ] ++ lib.optionals stdenv.isLinux [ xorg.libxcb + ] ++ lib.optionals (!useQt6) [ + qt5.qtx11extras + ] ++ lib.optionals useQt6 [ + qtwayland + ]; + + # Qt setup hook complains about missing `wrapQtAppsHook` otherwise. + dontWrapQtApps = true; + + cmakeFlags = lib.optionals useQt6 [ + "-DUSE_QT6=true" ]; postPatch = '' |