cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #227301 from totoroot/update/qownnotes-qt6

Browse source 
qownnotes: build with Qt6
This commit is contained in:
Weijia Wang 2023-05-04 01:46:04 +03:00 committed by GitHub
commit aa22d5ca37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/office/qownnotes/default.nix
View file

@ -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 =

2
pkgs/top-level/all-packages.nix
View file

@ -11568,7 +11568,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;
};