brickstore: 2024.12.3 -> 2026.3.2 (#502314)

pkgs/by-name/br/brickstore/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   qt6,
-  libsForQt5,
+  qt6Packages,
   fetchFromGitHub,
   gst_all_1,
   cmake,
@@ -11,18 +11,15 @@
   ninja,
   pkg-config,
 }:
-let
-  inherit (libsForQt5) qcoro;
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "brickstore";
-  version = "2024.12.3";
+  version = "2026.3.2";
 
   src = fetchFromGitHub {
     owner = "rgriebl";
     repo = "brickstore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q=";
+    hash = "sha256-UIVzvzsterKkL8/JPx5S0wly6mLxflAqX0gMFX3rOes=";
     fetchSubmodules = true;
   };
 
@@ -31,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
     libglvnd
     ninja
     pkg-config
-    qcoro
     qt6.qtdoc
     qt6.qtdeclarative
     qt6.qtimageformats
@@ -42,20 +38,15 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qttools
     qt6.qtwayland
     qt6.wrapQtAppsHook
+    qt6Packages.qcoro
     onetbb
   ];
 
-  patches = [
-    ./qcoro-cmake.patch # Don't have CMake fetch qcoro from github, get it from nixpkgs
-    ./qjsonvalue-include.patch # Add a required '#include <QtCore/QJsonValue>'
-  ];
-
-  # Since we get qcoro from nixpkgs instead, change the CMake file to reflect the right directory
-  preConfigure = ''
-    substituteInPlace cmake/BuildQCoro.cmake \
-      --replace-fail \
-        'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \
-        'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)'
+  # Use nix-provided qcoro instead of fetching from GitHub
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'include(BuildQCoro)' \
+        'find_package(QCoro6 CONFIG REQUIRED COMPONENTS Core Network Qml)'
   '';
 
   qtWrapperArgs = [

pkgs/by-name/br/brickstore/qcoro-cmake.patch

@@ -1,20 +0,0 @@
-diff --git a/cmake/BuildQCoro.cmake b/cmake/BuildQCoro.cmake
-index 941e813..41c88c6 100644
---- a/cmake/BuildQCoro.cmake
-+++ b/cmake/BuildQCoro.cmake
-@@ -14,14 +14,6 @@ if (BACKEND_ONLY)
-     set(QCORO_WITH_QML OFF)
- endif()
- 
--FetchContent_Declare(
--    qcoro
--    GIT_REPOSITORY https://github.com/danvratil/qcoro.git
--    GIT_TAG        v${QCORO_VERSION}
--    SOURCE_SUBDIR  "NeedManualAddSubDir" # make it possible to add_subdirectory below
--)
--
--FetchContent_MakeAvailable(qcoro)
- 
- set(mll ${CMAKE_MESSAGE_LOG_LEVEL})
- if (NOT VERBOSE_FETCH)
-

pkgs/by-name/br/brickstore/qjsonvalue-include.patch

@@ -1,12 +0,0 @@
-diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp
-index 14426e5b..59856f0c 100755
---- a/src/bricklink/order.cpp
-+++ b/src/bricklink/order.cpp
-@@ -16,6 +16,7 @@
- #include <QtSql/QSqlError>
- #include <QtSql/QSqlQueryModel>
- #include <QtCore/QLoggingCategory>
-+#include <QtCore/QJsonValue>
- 
- #include "bricklink/core.h"
- #include "bricklink/io.h"