diff --git a/edix/packages/star-3d.scm b/edix/packages/star-3d.scm index de1ceed1827fbb30ae998f8e62c9aaba4a0c333a..2ce5a8a8bfb2fc9c1cd57b4ad0eb11e1ce19c6a2 100644 --- a/edix/packages/star-3d.scm +++ b/edix/packages/star-3d.scm @@ -44,11 +44,11 @@ (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))))) + (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))))) (add-after 'install 'install-pkg-config (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -73,44 +73,3 @@ (license (list gpl3+)))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; (define-public star-3d ;; -;; (package ;; -;; (name "star-3d") ;; -;; (version "0.10") ;; -;; (source (origin ;; -;; (method git-fetch) ;; -;; (uri (git-reference ;; -;; (url "https://gitlab.com/meso-star/star-3d.git") ;; -;; (commit "0.10"))) ;; -;; (sha256 ;; -;; (base32 "1pdm69fbwh8i0qg54b75bkw0yyl19w2di7l775anrigh43q5w3b6")))) ;; -;; (build-system gnu-build-system) ;; -;; (native-inputs ;; -;; (list pkg-config autoconf automake libtool rsys embree-edix)) ;; -;; (inputs ;; -;; (list gcc ;; -;; gfortran ;; -;; bash ;; -;; gnu-make ;; -;; )) ;; -;; (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-3d") ;; Remplacez avec le bon lien ;; -;; (synopsis "Bibliothèque Star-3D") ;; -;; (description "Star-3D") ;; -;; (license (list gpl3+)))) ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/edix/packages/star-enclosures-3d.scm b/edix/packages/star-enclosures-3d.scm index a0f0a72e75390c6f12ff2cdfd629e4bcf658eefc..8f2bd6d17ffd5dcde65b0d615cb0b634f55b6f91 100644 --- a/edix/packages/star-enclosures-3d.scm +++ b/edix/packages/star-enclosures-3d.scm @@ -31,12 +31,12 @@ (base32 "1jh0q1lmxc7lp820dzip5i18pr2h1ygsly5iss10593y95d58sj6")))) (build-system gnu-build-system) (native-inputs - (list pkg-config autoconf automake libtool)) + (list pkg-config autoconf automake libtool rsys star-3d)) (inputs (list gcc gfortran bash - gnu-make rsys star-3d + gnu-make )) (arguments `(#:make-flags (list (string-append "CC=gcc" ))