summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornomike <nomike@nomike.com>2026-06-15 19:23:59 +0200
committerAndreas Enge <andreas@enge.fr>2026-08-03 17:02:03 +0200
commitbcd68ce6f3a7449f4848c580ef80147d5d1078fb (patch)
tree9d71bf33a7701e6b806fbdf9910696a3cfbd337a
parentac4213a232d0439c07f21878fe9281e47b720f0e (diff)
gnu: openscad: Update to 2026.07.26-0.04834ad.
gnu/packages/engineering.scm (openscad): Update to 2026.07.26-0.04834ad. [arguments]: Add #:qtbase and #:build-type; update 'patch-source #:phase. [inputs]: Delete boost-1.83, qscintilla-qt5, qtbase-5, qtgamepad-5, qtmultimedia-5, qtsvg-5, qtwayland-5; add boost, openssl, qscintilla-qt6, qt5compat, qtmultimedia, qtsvg and qtwayland. [native-inputs]: Delete which. Modified-by: Cayetano Santos <csantosb@inventati.org> Signed-off-by: Andreas Enge <andreas@enge.fr>
-rw-r--r--gnu/packages/engineering.scm30
1 files changed, 15 insertions, 15 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index df3249cdb47..fafb9ddaf42 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3034,8 +3034,8 @@ ontinuous-time and discret-time expressions.")
3034 (license license:lgpl2.1+))) 3034 (license license:lgpl2.1+)))
3035 3035
3036(define-public openscad 3036(define-public openscad
3037 (let ((commit "5d6e37dd177d9d9329234cb5d3c0491ab0f23dcd") 3037 (let ((commit "04834adb1ba3c9a6e4160747c91cbadbce9c37b3")
3038 (version "2025.09.02") 3038 (version "2026.07.26")
3039 (revision "0")) 3039 (revision "0"))
3040 (package 3040 (package
3041 (name "openscad") 3041 (name "openscad")
@@ -3051,16 +3051,17 @@ ontinuous-time and discret-time expressions.")
3051 ;; deleted in the patch-source build phase. 3051 ;; deleted in the patch-source build phase.
3052 (recursive? #t))) 3052 (recursive? #t)))
3053 (sha256 3053 (sha256
3054 (base32 "1cga32b65wbap59nmw37f75ys3gj9bk09nqzq7949x9kqlal13mx")) 3054 (base32 "05dym56zd2r5wrwq58lblhwa3b0xzh443pgsyambpjf9p534zi1k"))
3055 (file-name (git-file-name name version)))) 3055 (file-name (git-file-name name version))))
3056 (build-system qt-build-system) 3056 (build-system qt-build-system)
3057 (arguments 3057 (arguments
3058 (list 3058 (list
3059 #:qtbase qtbase ;for qt-6
3059 ;; OpenSCAD doesn't cope well with out-of-source builds. 3060 ;; OpenSCAD doesn't cope well with out-of-source builds.
3060 #:out-of-source? #f 3061 #:out-of-source? #f
3062 #:build-type "Release"
3061 #:configure-flags 3063 #:configure-flags
3062 #~(list "-DCMAKE_BUILD_TYPE=Release" 3064 #~(list "-DUSE_BUILTIN_CLIPPER2=OFF"
3063 "-DUSE_BUILTIN_CLIPPER2=OFF"
3064 "-DUSE_BUILTIN_MANIFOLD=OFF" 3065 "-DUSE_BUILTIN_MANIFOLD=OFF"
3065 "-DUSE_BUILTIN_OPENCSG=OFF" 3066 "-DUSE_BUILTIN_OPENCSG=OFF"
3066 "-DMANIFOLD_PYBIND=OFF" 3067 "-DMANIFOLD_PYBIND=OFF"
@@ -3093,11 +3094,11 @@ ontinuous-time and discret-time expressions.")
3093 "") 3094 "")
3094 ;; Fix detection of EGL (see 3095 ;; Fix detection of EGL (see
3095 ;; https://github.com/openscad/openscad/issues/5880). 3096 ;; https://github.com/openscad/openscad/issues/5880).
3096 (("target_link_libraries\\(OpenSCAD PRIVATE OpenGL::EGL\\)") 3097 (("target_link_libraries\\(OpenSCADLibInternal PUBLIC OpenGL::EGL\\)")
3097 "find_package(ECM REQUIRED NO_MODULE) 3098 "find_package(ECM REQUIRED NO_MODULE)
3098 list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) 3099 list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
3099 find_package(EGL REQUIRED) 3100 find_package(EGL REQUIRED)
3100 target_link_libraries(OpenSCAD PRIVATE EGL::EGL)") 3101 target_link_libraries(OpenSCADLibInternal PRIVATE EGL::EGL)")
3101 ;; Use the system sanitizers-cmake module. 3102 ;; Use the system sanitizers-cmake module.
3102 (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake") 3103 (("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake")
3103 (string-append (assoc-ref inputs "sanitizers-cmake") 3104 (string-append (assoc-ref inputs "sanitizers-cmake")
@@ -3112,7 +3113,7 @@ ontinuous-time and discret-time expressions.")
3112 (lambda _ 3113 (lambda _
3113 ;; Required for fontconfig 3114 ;; Required for fontconfig
3114 (setenv "HOME" "/tmp")))))) 3115 (setenv "HOME" "/tmp"))))))
3115 (inputs (list boost-1.83 3116 (inputs (list boost
3116 cairomm 3117 cairomm
3117 cgal 3118 cgal
3118 clipper2 3119 clipper2
@@ -3137,15 +3138,15 @@ ontinuous-time and discret-time expressions.")
3137 mpfr 3138 mpfr
3138 nettle 3139 nettle
3139 opencsg 3140 opencsg
3141 openssl
3140 python 3142 python
3141 python-numpy 3143 python-numpy
3142 python-pillow 3144 python-pillow
3143 qscintilla-qt5 3145 qscintilla-qt6
3144 qtbase-5 3146 qt5compat
3145 qtgamepad-5 3147 qtmultimedia
3146 qtmultimedia-5 3148 qtsvg
3147 qtsvg-5 3149 qtwayland
3148 qtwayland-5
3149 sanitizers-cmake 3150 sanitizers-cmake
3150 onetbb)) 3151 onetbb))
3151 (native-inputs (list bison 3152 (native-inputs (list bison
@@ -3153,7 +3154,6 @@ ontinuous-time and discret-time expressions.")
3153 flex 3154 flex
3154 gettext-minimal 3155 gettext-minimal
3155 pkg-config 3156 pkg-config
3156 which
3157 xvfb-run 3157 xvfb-run
3158 ;; the following are only needed for tests 3158 ;; the following are only needed for tests
3159 imagemagick 3159 imagemagick