diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-12-17 17:17:38 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2023-12-17 17:17:58 +0200 |
commit | e440df2a23b72bf7c1bf03d7c0774e0c66b39dea (patch) | |
tree | fa07e18cdffca352c92b40a5d1bad186c639c0f4 | |
parent | 4276c595606d8bb2b24de8d91dd465dd1da131a5 (diff) |
gnu: gsl-static: Remove variable.
* gnu/packages/maths.scm (gsl-static): Remove variable.
* gnu/packages/ocaml.scm (ocaml4.07-gsl-1)[inputs]: Replace gsl-static
with gsl:static.
Change-Id: I20af472e62582b403afa4be80b2d3f725903dabc
-rw-r--r-- | gnu/packages/maths.scm | 9 | ||||
-rw-r--r-- | gnu/packages/ocaml.scm | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ad514a4641..8c8af70f1c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -764,15 +764,6 @@ numbers.") (license license:gpl3+))) -;; TODO: Merge back into the gsl package as a separate output. -(define-public gsl-static - (package/inherit gsl - (name "gsl-static") - (arguments - `(,@(package-arguments gsl) - #:configure-flags (list "--disable-shared") - #:make-flags (list "CFLAGS=-fPIC"))))) - (define-public sleef (package (name "sleef") diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 327f3449a3..f0510f0d9f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6279,7 +6279,7 @@ the OCaml language.") "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh")))) (build-system ocaml-build-system) (inputs - `(("gsl" ,gsl-static))) + `(("gsl" ,(gsl "static")))) (native-inputs `(("ocamlbuild" ,ocamlbuild))) (arguments '()) |