diff options
| author | nomike <nomike@nomike.com> | 2025-08-06 02:30:48 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@friendly-machines.com> | 2025-08-09 23:05:17 +0200 |
| commit | f70a74b2ffc4a93a2571a6b0f24915783d56ccc5 (patch) | |
| tree | 395a8b5c42ada8bece566c6b5fc5ac5d2042c1a3 /gnu/packages | |
| parent | c1045f169aab7e1015a964c7552baa5c0e9a4ff6 (diff) | |
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 <dannym@friendly-machines.com>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/engineering.scm | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 77383428b56..1c1f448c1af 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 |