From e0407ca0a3a3dac0ffeca5d72b0b2ac9e83932d7 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 12 Jun 2021 21:11:40 +0000 Subject: [PATCH] gnu: libngspice: Enable ciderlib. * gnu/packages/engineering.scm (libngspice)[source]: Remove snippet that deleted ciderlib. [arguments]: Pass "--enable-ciderlib" to #:configure-flags. [license]: Add license for ciderlib. Signed-off-by: Efraim Flashner --- gnu/packages/engineering.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3faafd9868..bfd0d2f685 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1694,20 +1694,7 @@ (define-public libngspice "old-releases/" version "/ngspice-" version ".tar.gz"))) (sha256 - (base32 "1dfpkgkwmgwhq8dnbb8dh28cfap6rw0yywkhmxr4jxclcvygyqr2")) - (modules '((guix build utils))) - ;; We remove the non-free cider and build without it. - (snippet - '(begin - (delete-file-recursively "src/ciderlib") - (delete-file "src/ciderinit") - (substitute* "configure" - (("src/ciderlib/Makefile") "") - (("src/ciderlib/input/Makefile") "") - (("src/ciderlib/support/Makefile") "") - (("src/ciderlib/oned/Makefile") "") - (("src/ciderlib/twod/Makefile") "")) - #t)))) + (base32 "1dfpkgkwmgwhq8dnbb8dh28cfap6rw0yywkhmxr4jxclcvygyqr2")))) (build-system gnu-build-system) (arguments `(;; No tests for libngspice exist. @@ -1731,6 +1718,7 @@ (define-public libngspice "/share/ngspice/scripts"))))) #:configure-flags (list "--enable-openmp" + "--enable-ciderlib" "--enable-xspice" "--with-ngshared" "--with-readline=yes"))) @@ -1750,6 +1738,7 @@ (define-public libngspice an embedded event driven algorithm.") (license (list license:lgpl2.0+ ; code in frontend/numparam (license:non-copyleft "file:///COPYING") ; spice3 bsd-style + license:bsd-3 ; ciderlib license:public-domain)))) ; xspice (define-public ngspice