From 27644cc8795fb09bbb8dbb97a2ced75cf1317ebd Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Sun, 13 Apr 2025 15:27:24 +0200
Subject: [PATCH] #3258 nix: add Qt 6.9 build environment

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 flake.lock | 25 +++++++++++++++++++++----
 flake.nix  |  4 ++++
 justfile   |  5 +++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 52b12a097..9147dacd1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722421184,
-        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
         "type": "github"
       },
       "original": {
@@ -32,10 +32,27 @@
         "type": "github"
       }
     },
+    "nixpkgs-qt69": {
+      "locked": {
+        "lastModified": 1743577216,
+        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6f095be4bda67105d2428224f4fb4899234ce683",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "6f095be4bda67105d2428224f4fb4899234ce683",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "nixpkgs-qt5153": "nixpkgs-qt5153"
+        "nixpkgs-qt5153": "nixpkgs-qt5153",
+        "nixpkgs-qt69": "nixpkgs-qt69"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index b72989040..3bb86e0c7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-qt69.url = "github:nixos/nixpkgs/6f095be4bda67105d2428224f4fb4899234ce683";
     nixpkgs-qt5153.url = "github:nixos/nixpkgs/72bbea9db7d727ed044e60b5f5febc60a3c5c955";
     #    systems.url = "github:nix-systems/default";
   };
@@ -11,16 +12,19 @@
     {
       self,
       nixpkgs,
+      nixpkgs-qt69,
       nixpkgs-qt5153,
     }:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
+      pkgs-qt69 = nixpkgs-qt69.legacyPackages.${system};
       pkgs-qt5153 = nixpkgs-qt5153.legacyPackages.${system};
     in
     {
       packages.${system} = {
         qownnotes-qt6 = pkgs.qt6Packages.callPackage (import ./default.nix) { };
+        qownnotes-qt69 = pkgs-qt69.qt6Packages.callPackage (import ./default.nix) { };
         qownnotes-qt5 = pkgs.libsForQt5.callPackage (import ./build-systems/nix/default-qt5.nix) { };
         qownnotes-qt5153 =
           pkgs-qt5153.libsForQt5.callPackage (import ./build-systems/nix/default-qt5.nix)
diff --git a/justfile b/justfile
index 39f8f447f..559152499 100644
--- a/justfile
+++ b/justfile
@@ -76,6 +76,11 @@ nix-build-qt5-force:
 nix-build-qt5153-force:
     nix build '.?submodules=1#qownnotes-qt5153' --rebuild
 
+# Build the application with Qt 6.9 for nix
+[group('nix')]
+nix-build-qt69 args='':
+    nix build '.?submodules=1#qownnotes-qt69' {{ args }}
+
 # Build the application with Qt6 for nix with a trace
 [group('nix')]
 nix-build-trace: