diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-01-29 14:27:10 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-07 12:28:54 +0100 |
| commit | a273b090b1549c72ee5df44b85a6d44769e8d0af (patch) | |
| tree | a26624edfa71483c9b987c04572136c345bb42c3 | |
| parent | 78708529c279fe4f1e6a387aa37e2a1e4fc5901a (diff) | |
gnu: gdal: Switch to pyproject.
* gnu/packages/geo.scm (gdal):
[arguments]<#:imported-modules, #:modules>: Switch to
pyproject-build-system.
<#:phases>: Improve phase 'swap-files, use site-packages.
Change-Id: Ie24b7c787a16d18c3b93f6bb10dd09095205562f
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
| -rw-r--r-- | gnu/packages/geo.scm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0081aba0f4e..fbb14375768 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1728,11 +1728,11 @@ vector data.") (arguments (list #:tests? #f + #:imported-modules (append %cmake-build-system-modules + %pyproject-build-system-modules) #:modules '((guix build cmake-build-system) - ((guix build python-build-system) #:prefix python:) + ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) - #:imported-modules `(,@%cmake-build-system-modules - (guix build python-build-system)) #:configure-flags #~(list "-DGDAL_USE_INTERNAL_LIBS=WHEN_NO_EXTERNAL" "-DGDAL_USE_JPEG12_INTERNAL=OFF" @@ -1741,20 +1741,19 @@ vector data.") #:phases #~(modify-phases %standard-phases (add-after 'install 'swap-files - (lambda _ + (lambda* (#:key inputs outputs #:allow-other-keys) ;; The RPATH of the binaries in build/swig/python/build/ is ;; rewritten in build/swig/python/for_install/build/. For ;; unknown reasons the files in the former directory are ;; installed when it should be those in the latter directory. ;; So we copy them ourselves. - (with-directory-excursion "../build/swig/python/for_install/build" + (with-directory-excursion + "../build/swig/python/for_install/build" (for-each (lambda (file) (install-file file (string-append - #$output - "/lib/python" - (python:python-version #$(this-package-native-input "python")) - "/site-packages/osgeo"))) + (py:site-packages inputs outputs) + "/osgeo"))) (find-files "." "\\.so")))))))) (inputs (list curl |