me
/
guix
Archived
1
0
Fork 0
Code

gnu: gromacs: Remove input labels and use gexps. 

* gnu/packages/chemistry.scm (gromacs)[arguments]: Turn into gexps.
[native-inputs]: Remove labels.  Remove (package-source googletest).
Ludovic Courtès 2023-01-10 10:53:20 +01:00 committed by Ludovic Courtès
parent 7934e9c556
commit 04bf1d9634
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/chemistry.scm
View File

@ -370,8 +370,8 @@ stored with user-specified precision.")
(patches (search-patches "gromacs-tinyxml2.patch")))) (patches (search-patches "gromacs-tinyxml2.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests #~(list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests
;; Unbundling ;; Unbundling
"-DGMX_USE_LMFIT=EXTERNAL" "-DGMX_USE_LMFIT=EXTERNAL"
"-DGMX_BUILD_OWN_FFTW=off" "-DGMX_BUILD_OWN_FFTW=off"
@ -381,13 +381,13 @@ stored with user-specified precision.")
"-DGMX_EXTERNAL_ZLIB=on" "-DGMX_EXTERNAL_ZLIB=on"
"-DGMX_EXTERNAL_TINYXML2=on" "-DGMX_EXTERNAL_TINYXML2=on"
(string-append "-DTinyXML2_DIR=" (string-append "-DTinyXML2_DIR="
(assoc-ref %build-inputs "tinyxml2")) #$(this-package-input "tinyxml2"))
;; Workaround for cmake/FindSphinx.cmake version parsing that does ;; Workaround for cmake/FindSphinx.cmake version parsing that does
;; not understand the guix-wrapped `sphinx-build --version' answer ;; not understand the guix-wrapped `sphinx-build --version' answer
(string-append "-DSPHINX_EXECUTABLE_VERSION=" (string-append "-DSPHINX_EXECUTABLE_VERSION="
,(package-version python-sphinx))) #$(package-version python-sphinx)))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fixes (add-after 'unpack 'fixes
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Still bundled: part of gromacs, source behind registration ;; Still bundled: part of gromacs, source behind registration
@ -404,21 +404,19 @@ stored with user-specified precision.")
(delete-file-recursively "src/external/tng_io") (delete-file-recursively "src/external/tng_io")
(delete-file-recursively "src/external/tinyxml2") (delete-file-recursively "src/external/tinyxml2")
(delete-file-recursively "src/external/googletest") (delete-file-recursively "src/external/googletest")
(copy-recursively (assoc-ref inputs "googletest-source") (copy-recursively #$(package-source googletest)
"src/external/googletest") "src/external/googletest")
;; This test warns about the build host hardware, disable ;; This test warns about the build host hardware, disable
(substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp"
(("TEST\\(HardwareTopologyTest, HwlocExecute\\)") (("TEST\\(HardwareTopologyTest, HwlocExecute\\)")
"void __guix_disabled()")) "void __guix_disabled()")))))))
#t)))))
(native-inputs (native-inputs
`(("doxygen" ,doxygen) (list doxygen
("googletest-source" ,(package-source googletest)) graphviz
("graphviz" ,graphviz) pkg-config
("pkg-config" ,pkg-config) python
("python" ,python) python-pygments
("python-pygments" ,python-pygments) python-sphinx))
("python-sphinx" ,python-sphinx)))
(inputs (inputs
(list fftwf (list fftwf
`(,hwloc-2 "lib") `(,hwloc-2 "lib")