From 6d1041f12bae8fec125cbd6ebdae3f9ade7b52e3 Mon Sep 17 00:00:00 2001
From: Olivier Farges <olivier.farges@univ-lorraine.fr>
Date: Sun, 2 Mar 2025 10:14:11 +0100
Subject: [PATCH] star-enclosures-2d ok
---
edix/packages/star-2d.scm | 3 ---
edix/packages/star-enclosures-2d.scm | 17 ++++-------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/edix/packages/star-2d.scm b/edix/packages/star-2d.scm
index 3e1e4b5..57b8a9f 100644
--- a/edix/packages/star-2d.scm
+++ b/edix/packages/star-2d.scm
@@ -36,9 +36,6 @@
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
- ;(replace 'build
- ; (lambda* (#:key make-flags #:allow-other-keys)
- ; (invoke "make" (string-join make-flags " "))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
diff --git a/edix/packages/star-enclosures-2d.scm b/edix/packages/star-enclosures-2d.scm
index 1f80709..bdff0a7 100644
--- a/edix/packages/star-enclosures-2d.scm
+++ b/edix/packages/star-enclosures-2d.scm
@@ -14,6 +14,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (edix packages star-2d)
+ #:use-module (edix packages embree-edix)
#:use-module (edix packages rsys))
(define-public star-enclosures-2d
@@ -26,30 +27,20 @@
(url "https://gitlab.com/meso-star/star-enclosures-2d.git")
(commit "0.6")))
(sha256
- (base32 "0jh6rznhpcsba47bcp4zmqhynmgsqaasz20qj1fzajwrc11nzzyn"))))
+ (base32 "1pdm69fbwh8i0qg54b75bkw0yyl19w2di7l775anrigh43q5w3b6"))))
(build-system gnu-build-system)
- (native-inputs
- (list pkg-config autoconf automake libtool))
- (inputs
- (list gcc
- gfortran
- bash
- gnu-make rsys star-2d
- ))
+ (native-inputs (list pkg-config autoconf automake libtool gcc gnu-make))
+ (propagated-inputs (list gcc rsys star-2d embree-edix))
(arguments
`(#:make-flags (list (string-append "CC=gcc" ))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(delete 'check)
- (replace 'build
- (lambda* (#:key make-flags #:allow-other-keys)
- (invoke "make" (string-join make-flags " "))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(invoke "make" "install" (string-append "PREFIX=" out))))))))
-
(home-page "https://meso-star.com/star-enclosures-2d") ;; Remplacez avec le bon lien
(synopsis "Bibliothèque Star-enclosures-2d")
(description "Star-enclosures-2d")
--
GitLab