amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: geo: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/geo.scm
(grass): Remove input labels and trailing #t.
[inputs]: Add bash-minimal.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ic9d1942098cbfa1d71a81b1f7e0dea352850a4ce
This commit is contained in:
Maxime Devos 2021-07-02 12:06:37 +02:00 • committed by Ludovic Courtès
parent 04edfcf7de
commit 94e7684004
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

69
gnu/packages/geo.scm
View file

@ -2780,39 +2780,40 @@ orienteering sport.")
(base32 "1gpfbppfajc8d6b9alw9fdzgaa83w26kl6fff1395bc9gal215ms")))) (base32 "1gpfbppfajc8d6b9alw9fdzgaa83w26kl6fff1395bc9gal215ms"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("bzip2" ,bzip2) (list bash-minimal
("cairo" ,cairo) bzip2
("fftw" ,fftw) cairo
("freetype" ,freetype) fftw
("gdal" ,gdal) freetype
("geos" ,geos) gdal
("glu" ,glu) geos
("libpng" ,libpng) glu
("libtiff" ,libtiff) libpng
("mesa" ,mesa) libtiff
("mariadb-dev" ,mariadb "dev") mesa
("mariadb-lib" ,mariadb "lib") `(,mariadb "dev")
("netcdf" ,netcdf) `(,mariadb "lib")
("openblas" ,openblas) netcdf
("perl" ,perl) openblas
("postgresql" ,postgresql) perl
("proj" ,proj) postgresql
("python" ,python) proj
("python-dateutil" ,python-dateutil) python
("python-numpy" ,python-numpy) python-dateutil
("python-wxpython" ,python-wxpython) python-numpy
("readline" ,readline) python-wxpython
("sqlite" ,sqlite) readline
("wxwidgets" ,wxwidgets) sqlite
("zlib" ,zlib) wxwidgets
("zstd" ,zstd "lib"))) zlib
`(,zstd "lib")))
(native-inputs (native-inputs
`(("bash" ,bash-minimal) (list bash-minimal
("bison" ,bison) bison
("flex" ,flex) flex
("pkg-config" ,pkg-config))) pkg-config))
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; No tests
#:modules ((guix build gnu-build-system) #:modules ((guix build gnu-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
@ -2870,16 +2871,14 @@ orienteering sport.")
(symlink (string-append dir "/include") (symlink (string-append dir "/include")
(string-append out "/include")) (string-append out "/include"))
(symlink (string-append dir "/lib") (symlink (string-append dir "/lib")
(string-append out "/lib"))) (string-append out "/lib")))))
#t))
(add-after 'install-links 'python:wrap (add-after 'install-links 'python:wrap
(assoc-ref python:%standard-phases 'wrap)) (assoc-ref python:%standard-phases 'wrap))
(add-after 'python:wrap 'wrap-with-python-interpreter (add-after 'python:wrap 'wrap-with-python-interpreter
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/" ,grassxx) (wrap-program (string-append out "/bin/" ,grassxx)
`("GRASS_PYTHON" = (,(which "python3")))) `("GRASS_PYTHON" = (,(which "python3"))))))))))
#t))))))
(synopsis "GRASS Geographic Information System") (synopsis "GRASS Geographic Information System")
(description (description
"GRASS (Geographic Resources Analysis Support System), is a Geographic "GRASS (Geographic Resources Analysis Support System), is a Geographic