pyrox.dev
brickstore: 2024.5.2 -> 2024.12.3 (#405293)
authored by Robert Scott and committed by GitHub 7b3c99fb 5c8fdd31
+8
-10
pkgs/by-name/br/brickstore/package.nix
+8
-10
pkgs/by-name/br/brickstore/package.nix
···
16
16
in
17
17
stdenv.mkDerivation (finalAttrs: {
18
18
pname = "brickstore";
19
-
version = "2024.5.2";
19
+
version = "2024.12.3";
20
20
21
21
src = fetchFromGitHub {
22
22
owner = "rgriebl";
23
23
repo = "brickstore";
24
24
rev = "v${finalAttrs.version}";
25
-
hash = "sha256-Bu9oNbZm3lx/CfYAReHyWe/kW+kaefDWeBtWLHOCORU=";
25
+
hash = "sha256-4sxPplZ1t8sSfwTCeeBtfU4U0gcE9FROt6dKvkfyO6Q=";
26
26
fetchSubmodules = true;
27
27
};
28
28
···
45
45
tbb
46
46
];
47
47
48
-
preConfigure = ''
49
-
sed -i '/^)$/d' cmake/BuildQCoro.cmake
48
+
patches = [
49
+
./qcoro-cmake.patch # Don't have CMake fetch qcoro from github, get it from nixpkgs
50
+
./qjsonvalue-include.patch # Add a required '#include <QtCore/QJsonValue>'
51
+
];
50
52
53
+
# Since we get qcoro from nixpkgs instead, change the CMake file to reflect the right directory
54
+
preConfigure = ''
51
55
substituteInPlace cmake/BuildQCoro.cmake \
52
-
--replace-fail 'FetchContent_Declare(' ' ' \
53
-
--replace-fail ' qcoro' ' ' \
54
-
--replace-fail ' GIT_REPOSITORY https://github.com/danvratil/qcoro.git' ' ' \
55
-
--replace-fail ' GIT_TAG v''${QCORO_VERSION}' ' ' \
56
-
--replace-fail 'FetchContent_GetProperties(qcoro)' ' ' \
57
-
--replace-fail 'FetchContent_Populate(qcoro)' ' ' \
58
56
--replace-fail \
59
57
'add_subdirectory(''${qcoro_SOURCE_DIR} ''${qcoro_BINARY_DIR} EXCLUDE_FROM_ALL)' \
60
58
'add_subdirectory(${qcoro.src} ${qcoro}bin/qcoro)'
+20
pkgs/by-name/br/brickstore/qcoro-cmake.patch
+20
pkgs/by-name/br/brickstore/qcoro-cmake.patch
···
1
+
diff --git a/cmake/BuildQCoro.cmake b/cmake/BuildQCoro.cmake
2
+
index 941e813..41c88c6 100644
3
+
--- a/cmake/BuildQCoro.cmake
4
+
+++ b/cmake/BuildQCoro.cmake
5
+
@@ -14,14 +14,6 @@ if (BACKEND_ONLY)
6
+
set(QCORO_WITH_QML OFF)
7
+
endif()
8
+
9
+
-FetchContent_Declare(
10
+
- qcoro
11
+
- GIT_REPOSITORY https://github.com/danvratil/qcoro.git
12
+
- GIT_TAG v${QCORO_VERSION}
13
+
- SOURCE_SUBDIR "NeedManualAddSubDir" # make it possible to add_subdirectory below
14
+
-)
15
+
-
16
+
-FetchContent_MakeAvailable(qcoro)
17
+
18
+
set(mll ${CMAKE_MESSAGE_LOG_LEVEL})
19
+
if (NOT VERBOSE_FETCH)
20
+
+12
pkgs/by-name/br/brickstore/qjsonvalue-include.patch
+12
pkgs/by-name/br/brickstore/qjsonvalue-include.patch
···
1
+
diff --git a/src/bricklink/order.cpp b/src/bricklink/order.cpp
2
+
index 14426e5b..59856f0c 100755
3
+
--- a/src/bricklink/order.cpp
4
+
+++ b/src/bricklink/order.cpp
5
+
@@ -16,6 +16,7 @@
6
+
#include <QtSql/QSqlError>
7
+
#include <QtSql/QSqlQueryModel>
8
+
#include <QtCore/QLoggingCategory>
9
+
+#include <QtCore/QJsonValue>
10
+
11
+
#include "bricklink/core.h"
12
+
#include "bricklink/io.h"