Unverified Commit aa22d5ca authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

qownnotes: build with Qt6
parents a85b9341 57de621a

pkgs/applications/office/qownnotes/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -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 =

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;















  };