tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
0
fork
atom
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
0
fork
atom
overview
issues
pulls
pipelines
orca-slicer: 2.2.0-unstable-2025-01-23 -> 2.3.0-rc
liberodark
1 year ago
2eb815ad
6fd99a01
+25
-24
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
or
orca-slicer
package.nix
patches
dont-link-opencv-world-orca.patch
+22
-21
pkgs/by-name/or/orca-slicer/package.nix
···
38
webkitgtk_4_0,
39
wxGTK31,
40
xorg,
0
41
withSystemd ? stdenv.hostPlatform.isLinux,
42
}:
43
let
···
55
];
56
});
57
in
58
-
stdenv.mkDerivation rec {
59
pname = "orca-slicer";
60
-
version = "v2.2.0-unstable-2025-01-23";
61
62
src = fetchFromGitHub {
63
owner = "SoftFever";
64
repo = "OrcaSlicer";
65
-
rev = "1b1288c4353afca44edee323061bdd5c87fcafb9";
66
-
hash = "sha256-IPdKusP2cB5jgr6JjQVu8ZjJ2kiG6mfmfZtDVSlAFNg=";
67
};
68
69
nativeBuildInputs = [
···
117
wxGTK'
118
xorg.libX11
119
opencv
0
120
]
121
++ lib.optionals withSystemd [ systemd ]
122
-
++ checkInputs;
123
124
patches = [
125
# Fix for webkitgtk linking
···
176
177
prePatch = ''
178
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
0
179
'';
180
181
cmakeFlags = [
182
-
"-DSLIC3R_STATIC=0"
183
-
"-DSLIC3R_FHS=1"
184
-
"-DSLIC3R_GTK=3"
185
-
"-DBBL_RELEASE_TO_PUBLIC=1"
186
-
"-DBBL_INTERNAL_TESTING=0"
187
-
"-DDEP_WX_GTK3=ON"
188
-
"-DSLIC3R_BUILD_TESTS=0"
189
-
"-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK"
190
-
"-DBOOST_LOG_DYN_LINK=1"
191
-
"-DBOOST_ALL_DYN_LINK=1"
192
-
"-DBOOST_LOG_NO_LIB=OFF"
193
-
"-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION"
194
-
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed"
195
-
"-DORCA_VERSION_CHECK_DEFAULT=OFF"
196
];
197
198
preFixup = ''
···
208
meta = {
209
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
210
homepage = "https://github.com/SoftFever/OrcaSlicer";
211
-
changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${version}";
212
license = lib.licenses.agpl3Only;
213
maintainers = with lib.maintainers; [
214
zhaofengli
···
219
mainProgram = "orca-slicer";
220
platforms = lib.platforms.linux;
221
};
222
-
}
···
38
webkitgtk_4_0,
39
wxGTK31,
40
xorg,
41
+
libnoise,
42
withSystemd ? stdenv.hostPlatform.isLinux,
43
}:
44
let
···
54
];
55
});
56
in
57
+
stdenv.mkDerivation (finalAttrs: {
58
pname = "orca-slicer";
59
+
version = "v2.3.0-rc";
60
61
src = fetchFromGitHub {
62
owner = "SoftFever";
63
repo = "OrcaSlicer";
64
+
tag = finalAttrs.version;
65
+
hash = "sha256-obQUn5vG+6g8PYK9Xatt3QiBPNWskoTs2Byi+1xabBk=";
66
};
67
68
nativeBuildInputs = [
···
116
wxGTK'
117
xorg.libX11
118
opencv
119
+
libnoise
120
]
121
++ lib.optionals withSystemd [ systemd ]
122
+
++ finalAttrs.checkInputs;
123
124
patches = [
125
# Fix for webkitgtk linking
···
174
175
prePatch = ''
176
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
177
+
sed -i 's|"libnoise/noise.h"|"noise/noise.h"|' src/libslic3r/PerimeterGenerator.cpp
178
'';
179
180
cmakeFlags = [
181
+
(lib.cmakeBool "SLIC3R_STATIC" false)
182
+
(lib.cmakeBool "SLIC3R_FHS" true)
183
+
(lib.cmakeFeature "SLIC3R_GTK" "3")
184
+
(lib.cmakeBool "BBL_RELEASE_TO_PUBLIC" true)
185
+
(lib.cmakeBool "BBL_INTERNAL_TESTING" false)
186
+
(lib.cmakeBool "SLIC3R_BUILD_TESTS" false)
187
+
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGL_SILENCE_DEPRECATION")
188
+
(lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-Wl,--no-as-needed")
189
+
(lib.cmakeBool "ORCA_VERSION_CHECK_DEFAULT" false)
190
+
(lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include/noise")
191
+
(lib.cmakeFeature "LIBNOISE_LIBRARY" "${libnoise}/lib/libnoise-static.a")
192
+
"-Wno-dev"
0
0
193
];
194
195
preFixup = ''
···
207
meta = {
208
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
209
homepage = "https://github.com/SoftFever/OrcaSlicer";
210
+
changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${finalAttrs.version}";
211
license = lib.licenses.agpl3Only;
212
maintainers = with lib.maintainers; [
213
zhaofengli
···
218
mainProgram = "orca-slicer";
219
platforms = lib.platforms.linux;
220
};
221
+
})
+3
-3
pkgs/by-name/or/orca-slicer/patches/dont-link-opencv-world-orca.patch
···
1
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
2
-
index 38a1b2499..00c9060b3 100644
3
--- a/src/libslic3r/CMakeLists.txt
4
+++ b/src/libslic3r/CMakeLists.txt
5
-
@@ -573,7 +573,8 @@ target_link_libraries(libslic3r
6
mcut
7
JPEG::JPEG
8
qoi
9
- opencv_world
10
+ opencv_core
11
+ opencv_imgproc
0
12
)
13
14
-
if(NOT WIN32)
···
1
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
2
+
index 64e0a9e87..e14f29488 100644
3
--- a/src/libslic3r/CMakeLists.txt
4
+++ b/src/libslic3r/CMakeLists.txt
5
+
@@ -576,7 +576,8 @@ target_link_libraries(libslic3r
6
mcut
7
JPEG::JPEG
8
qoi
9
- opencv_world
10
+ opencv_core
11
+ opencv_imgproc
12
+
noise::noise
13
)
14
0