Sending a v2 removing readline from inputs because it's unused now.
From 7dc50ffb272c391cb2afa8b874f6d487e6020423 Mon Sep 17 00:00:00 2001
From: Vinicius Monego <mon...@posteo.net>
Date: Tue, 22 Jun 2021 09:46:32 -0300
Subject: [PATCH v2 1/2] gnu: libngspice: Fix KiCad compilation.
* gnu/packages/engineering.scm (libngspice)[arguments]<#:configure-flags>:
Pass "--with-readline=no".
[inputs]: Remove readline.
---
gnu/packages/engineering.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 5b1c8b7938..a50e6d6526 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1721,14 +1721,15 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
"--enable-ciderlib"
"--enable-xspice"
"--with-ngshared"
- "--with-readline=yes")))
+ ;; Readline must be disabled to build KiCad with ngspice 34. See
+ ;; https://bugs.archlinux.org/task/70563 for reference.
+ "--with-readline=no")))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)))
(inputs
`(("libxaw" ,libxaw)
- ("mpi" ,openmpi)
- ("readline" ,readline)))
+ ("mpi" ,openmpi)))
(home-page "http://ngspice.sourceforge.net/";)
(synopsis "Mixed-level/mixed-signal circuit simulator")
(description
--
2.32.0
From bc8bdfc9f403e585f4f18796a8fb7bb3e5699134 Mon Sep 17 00:00:00 2001
From: Vinicius Monego <mon...@posteo.net>
Date: Tue, 22 Jun 2021 09:53:41 -0300
Subject: [PATCH v2 2/2] gnu: libngspice: Delete autogenerated config.h.
* gnu/packages/engineering.scm (libngspice)[arguments]<#:phases>: Rename phase
'delete-script-files to 'delete-scripts-and-config and delete config.h.
---
gnu/packages/engineering.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index a50e6d6526..b2aa2179dd 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1711,11 +1711,16 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
(substitute* "man/man1/Makefile.in"
(("^man_MANS = ngspice\\.1 ngnutmeg\\.1 ngsconvert\\.1 ngmultidec\\.1")
"man_MANS = "))))
- (add-after 'install 'delete-script-files
+ (add-after 'install 'delete-scripts-and-config
(lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively
(string-append (assoc-ref outputs "out")
- "/share/ngspice/scripts")))))
+ "/share/ngspice/scripts"))
+ ;; This file is autogenerated by the configure script and should
+ ;; not be distributed. It could be removed in ngspice 35. See
+ ;; https://bugs.archlinux.org/task/70569 for reference.
+ (delete-file (string-append (assoc-ref outputs "out")
+ "/include/config.h")))))
#:configure-flags
(list "--enable-openmp"
"--enable-ciderlib"
--
2.32.0
