From f70a74b2ffc4a93a2571a6b0f24915783d56ccc5 Mon Sep 17 00:00:00 2001 From: nomike Date: Wed, 6 Aug 2025 02:30:48 +0200 Subject: [PATCH] gnu: pythonscad: Fix in-application version display. * gnu/packages/engineering.scm (pythonscad): Fix in-application version display. [arguments]<#:configure-flags>: Filter out flags "-DOPENSCAD_VERSION" and "-DOPENSCAD_COMMIT" from inherited package. Add flags "-DOPENSCAD_VERSION" and "-DOPENSCAD_COMMIT" locally. Change-Id: I3d0b8e97dfb14041491cfd67baf1a9d3d15c1b86 Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 77383428b56350a93cccd9a37b480a975f060f3f..1c1f448c1afaa4e0481ac7d8041149a62ace39d6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3477,13 +3477,23 @@ models in the STL and OFF file formats.") (file-name (git-file-name name version)))) (arguments (substitute-keyword-arguments (package-arguments openscad) - ((#:configure-flags flags - '()) - #~(append #$flags - (list "-DENABLE_LIBFIVE=ON" "-DUSE_BUILTIN_LIBFIVE=OFF" - (string-append "-DPYTHON_VERSION=" - #$(version-major+minor - (package-version python)))))) + ((#:configure-flags flags) + #~(begin + (use-modules (srfi srfi-1)) + (append + (remove (lambda (flag) + (or (string-prefix? "-DOPENSCAD_VERSION=" flag) + (string-prefix? "-DOPENSCAD_COMMIT=" flag))) + #$flags) + (list "-DENABLE_LIBFIVE=ON" + "-DUSE_BUILTIN_LIBFIVE=OFF" + (string-append "-DOPENSCAD_VERSION=" + #$version) + (string-append "-DOPENSCAD_COMMIT=" + #$commit) + (string-append "-DPYTHON_VERSION=" + #$(version-major+minor + (package-version python))))))) ((#:phases phases) #~(modify-phases #$phases (replace 'patch-source