diff options
Diffstat (limited to 'nixpkgs/pkgs/data/themes/adwaita-qt/default.nix')
-rw-r--r-- | nixpkgs/pkgs/data/themes/adwaita-qt/default.nix | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix index 869c9beb9b7c..88bec5d09d62 100644 --- a/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix +++ b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix @@ -1,18 +1,19 @@ -{ 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"; + version = "1.4.2"; outputs = [ "out" "dev" ]; @@ -20,7 +21,7 @@ mkDerivation rec { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "sha256-t9vv1KcMUg8Qe7lhVMN4GO+VPoT7QzeoQ6hV4fesA8U="; + sha256 = "sha256-K/+SL52C+M2OC4NL+mhBnm/9BwH0KNNTGIDmPwuUwkM="; }; nativeBuildInputs = [ @@ -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 = '' @@ -42,9 +53,7 @@ mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; }; meta = with lib; { @@ -53,6 +62,5 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.all; - broken = stdenv.isDarwin; # broken since 2021-12-05 on hydra, broken until qt515 will be used for darwin }; } |