diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-11 22:18:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-11 22:18:05 +0100 |
| commit | b03e4fd5269897448124a7b61a737802b2c638ee (patch) | |
| tree | e4eaab1d3076e335c57eea462ff7fda7919f0831 /gnu/packages/engineering.scm | |
| parent | da3c6a7f19ef1243af725f63c16c8fd92fde33b4 (diff) | |
| parent | 99aad42138e0895df51e64e1261984f277952516 (diff) | |
| download | guix-patches-b03e4fd5269897448124a7b61a737802b2c638ee.tar guix-patches-b03e4fd5269897448124a7b61a737802b2c638ee.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/engineering.scm')
| -rw-r--r-- | gnu/packages/engineering.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0080356494..308501f882 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -717,6 +717,13 @@ language.") "-DBUILD_GITHUB_PLUGIN=OFF") #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-boost-include + (lambda _ + ;; The location of this header changed in Boost 1.66. + (substitute* "3d-viewer/3d_cache/3d_cache.cpp" + (("boost/uuid/sha1\\.hpp") + "boost/uuid/detail/sha1.hpp")) + #t)) (add-after 'install 'wrap-program ;; Ensure correct Python at runtime. (lambda* (#:key inputs outputs #:allow-other-keys) @@ -1702,7 +1709,7 @@ parallel computing platforms. It also supports serial execution.") ("gcc-toolchain" ,gcc-toolchain) ("iverilog" ,iverilog) ("libtool" ,libtool) - ("octave" ,octave) + ("octave" ,octave-cli) ("qt4" ,qt-4) ("sed" ,sed))) (home-page "http://qucs.sourceforge.net/") @@ -1832,7 +1839,7 @@ simulations are also supported.") ("libtool" ,libtool) ("mpi" ,openmpi) ("ngspice" ,ngspice) - ("octave" ,octave) + ("octave" ,octave-cli) ("qt4" ,qt-4) ("qucs" ,qucs) ("sed" ,sed) |