diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-06-15 23:55:04 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-06-23 10:09:00 +0200 |
| commit | 30dc74d027af04190b5fe66f0ada989f0fd07c9a (patch) | |
| tree | b5ff93cb53e026348352f86d58d18f4ef22520c7 /gnu/packages/simulation.scm | |
| parent | fe7c898750e3fdad586ab3929c67b4b4643ffece (diff) | |
| download | guix-30dc74d027af04190b5fe66f0ada989f0fd07c9a.tar guix-30dc74d027af04190b5fe66f0ada989f0fd07c9a.tar.gz | |
gnu: esmini: Update to 2.37.11.
* gnu/packages/simulation.scm (esmini): Update to 2.37.11.
[arguments]<#:configure-flags>: Add “-DUSE_IMPLOT=FALSE”.
<#:phases>: Adjust accordingly.
* gnu/packages/patches/esmini-use-pkgconfig.patch: Update accordingly.
* gnu/packages/patches/esmini-no-clutter-log.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/simulation.scm')
| -rw-r--r-- | gnu/packages/simulation.scm | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index d5fc1e3d17..4fa2e93d81 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -495,15 +495,14 @@ functions in virtual scenarios.") (define-public esmini (package (name "esmini") - (version "2.27.1") + (version "2.37.11") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/esmini/esmini") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "esmini-use-pkgconfig.patch" - "esmini-no-clutter-log.patch")) + (patches (search-patches "esmini-use-pkgconfig.patch")) (modules '((guix build utils) (ice-9 ftw))) (snippet #~(with-directory-excursion "externals" @@ -513,29 +512,21 @@ functions in virtual scenarios.") (scandir ".")))) (sha256 (base32 - "07ccydz7kxy5jc52f8fmxg4nkr1spshfnpzcv0wgd5lqz9ghjahz")))) + "07pwa34nf0b4ihb9fn1pvfi0b39hd8r630nfa6v3a17dsy66a730")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DDYN_PROTOBUF=TRUE") + #:configure-flags + #~(list "-DDYN_PROTOBUF=TRUE" + ;; Missing implot package + "-DUSE_IMPLOT=FALSE") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-cmake (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_HOME_DIRECTORY\\}/bin") - (string-append (assoc-ref outputs "out") "/bin"))) - (substitute* "EnvironmentSimulator/CMakeLists.txt" - (("\\$\\{OSI_DIR\\}/(include|lib)(-dyn)?" all what) - (search-input-directory - inputs - (string-append what "/osi" - #$(version-major - (package-version - (this-package-input - "open-simulation-interface")))))) - (("\\$\\{SUMO_BASE_DIR\\}/\\$\\{EXT_DIR_NAME\\}") - #$(this-package-input "sumo"))))) + (substitute* "support/cmake/common/locations.cmake" + (("\\$\\{CMAKE_SOURCE_DIR\\}/bin") + (string-append (assoc-ref outputs "out") "/bin"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (with-directory-excursion "EnvironmentSimulator/Unittest/" @@ -549,7 +540,7 @@ functions in virtual scenarios.") (lambda (f) (rename-file f (string-append out "/lib/" (basename f)))) - (find-files "." "\\.so$"))))))))) + (find-files "." "\\.(a|so)$"))))))))) (inputs (list mesa openscenegraph `(,openscenegraph "pluginlib") open-simulation-interface |