tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

orca-slicer: 2.2.0-unstable-2025-01-23 -> 2.3.0-rc

liberodark 2eb815ad 6fd99a01

+25 -24
unified split
+22 -21
pkgs/by-name/or/orca-slicer/package.nix
··· 38 38 webkitgtk_4_0, 39 39 wxGTK31, 40 40 xorg, 41 + libnoise, 41 42 withSystemd ? stdenv.hostPlatform.isLinux, 42 43 }: 43 44 let ··· 54 55 ]; 55 56 }); 56 57 in 57 - stdenv.mkDerivation rec { 58 + stdenv.mkDerivation (finalAttrs: { 58 59 pname = "orca-slicer"; 59 - version = "v2.2.0-unstable-2025-01-23"; 60 + version = "v2.3.0-rc"; 60 61 61 62 src = fetchFromGitHub { 62 63 owner = "SoftFever"; 63 64 repo = "OrcaSlicer"; 64 - rev = "1b1288c4353afca44edee323061bdd5c87fcafb9"; 65 - hash = "sha256-IPdKusP2cB5jgr6JjQVu8ZjJ2kiG6mfmfZtDVSlAFNg="; 65 + tag = finalAttrs.version; 66 + hash = "sha256-obQUn5vG+6g8PYK9Xatt3QiBPNWskoTs2Byi+1xabBk="; 66 67 }; 67 68 68 69 nativeBuildInputs = [ ··· 116 117 wxGTK' 117 118 xorg.libX11 118 119 opencv 120 + libnoise 119 121 ] 120 122 ++ lib.optionals withSystemd [ systemd ] 121 - ++ checkInputs; 123 + ++ finalAttrs.checkInputs; 122 124 123 125 patches = [ 124 126 # Fix for webkitgtk linking ··· 174 176 175 177 prePatch = '' 176 178 sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake 179 + sed -i 's|"libnoise/noise.h"|"noise/noise.h"|' src/libslic3r/PerimeterGenerator.cpp 177 180 ''; 178 181 179 182 cmakeFlags = [ 180 - "-DSLIC3R_STATIC=0" 181 - "-DSLIC3R_FHS=1" 182 - "-DSLIC3R_GTK=3" 183 - "-DBBL_RELEASE_TO_PUBLIC=1" 184 - "-DBBL_INTERNAL_TESTING=0" 185 - "-DDEP_WX_GTK3=ON" 186 - "-DSLIC3R_BUILD_TESTS=0" 187 - "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK" 188 - "-DBOOST_LOG_DYN_LINK=1" 189 - "-DBOOST_ALL_DYN_LINK=1" 190 - "-DBOOST_LOG_NO_LIB=OFF" 191 - "-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION" 192 - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed" 193 - "-DORCA_VERSION_CHECK_DEFAULT=OFF" 183 + (lib.cmakeBool "SLIC3R_STATIC" false) 184 + (lib.cmakeBool "SLIC3R_FHS" true) 185 + (lib.cmakeFeature "SLIC3R_GTK" "3") 186 + (lib.cmakeBool "BBL_RELEASE_TO_PUBLIC" true) 187 + (lib.cmakeBool "BBL_INTERNAL_TESTING" false) 188 + (lib.cmakeBool "SLIC3R_BUILD_TESTS" false) 189 + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGL_SILENCE_DEPRECATION") 190 + (lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-Wl,--no-as-needed") 191 + (lib.cmakeBool "ORCA_VERSION_CHECK_DEFAULT" false) 192 + (lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include/noise") 193 + (lib.cmakeFeature "LIBNOISE_LIBRARY" "${libnoise}/lib/libnoise-static.a") 194 + "-Wno-dev" 194 195 ]; 195 196 196 197 preFixup = '' ··· 207 208 meta = { 208 209 description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"; 209 210 homepage = "https://github.com/SoftFever/OrcaSlicer"; 210 - changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${version}"; 211 + changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${finalAttrs.version}"; 211 212 license = lib.licenses.agpl3Only; 212 213 maintainers = with lib.maintainers; [ 213 214 zhaofengli ··· 218 219 mainProgram = "orca-slicer"; 219 220 platforms = lib.platforms.linux; 220 221 }; 221 - } 222 + })