diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
| commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
| tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /gnu/packages/engineering.scm | |
| parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
| parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
| download | guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to 'gnu/packages/engineering.scm')
| -rw-r--r-- | gnu/packages/engineering.scm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e6e1382380..c02d07fba1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1711,24 +1711,30 @@ 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" "--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 |