diff options
| author | Matthias Thym <git@thym.at> | 2023-04-20 19:14:20 +0200 |
|---|---|---|
| committer | Matthias Thym <git@thym.at> | 2023-05-03 23:22:36 +0200 |
| commit | 57de621aaef7fe6118cca9dcc15ac8a595dc3db8 (patch) | |
| tree | c1dad74ae9906fb038172dcf563a27762bc671c8 /pkgs | |
| parent | 6cc0a7aedfa6e3f8c185a4e935174ad2f065b592 (diff) | |
qownnotes: build with Qt6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/qownnotes/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index aa827bdf910db..f0d634b91418b 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -8,8 +8,7 @@ , qtsvg , qtwayland , qtwebsockets -, qtx11extras -, qtxmlpatterns +, qt5compat , makeWrapper , wrapQtAppsHook }: @@ -24,7 +23,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-W1bu3isEe1j7XTj+deLNk6Ncssy2UKG+eF36fe1FFWs="; + hash = "sha256-W1bu3isEe1j7XTj+deLNk6Ncssy2UKG+eF36fe1FFWs="; }; nativeBuildInputs = [ @@ -38,8 +37,7 @@ stdenv.mkDerivation { qtdeclarative qtsvg qtwebsockets - qtx11extras - qtxmlpatterns + qt5compat ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; postInstall = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b5e2329b05c..3626995ae4fb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11564,7 +11564,7 @@ with pkgs; qovery-cli = callPackage ../tools/admin/qovery-cli { }; - qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { + qownnotes = qt6Packages.callPackage ../applications/office/qownnotes { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; |