[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/11: gnu: kicad: Fix build with Boost >= 1.68.
From: |
guix-commits |
Subject: |
03/11: gnu: kicad: Fix build with Boost >= 1.68. |
Date: |
Mon, 3 Dec 2018 11:47:42 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 8aaec042d4a7cff68c219443517b55b1d9f0ee9c
Author: Marius Bakke <address@hidden>
Date: Sun Dec 2 18:33:57 2018 +0100
gnu: kicad: Fix build with Boost >= 1.68.
* gnu/packages/engineering.scm (kicad)[arguments]: Add phase
'adjust-boost-include'.
---
gnu/packages/engineering.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 0080356..8ef9a5c 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)
- branch master updated (a8fdca1 -> 4f03aa2), guix-commits, 2018/12/03
- 04/11: gnu: Add python-pywavelets., guix-commits, 2018/12/03
- 07/11: gnu: python-scikit-image: Update to 0.14.1., guix-commits, 2018/12/03
- 10/11: gnu: python-statsmodels: Update to 0.9.0., guix-commits, 2018/12/03
- 01/11: gnu: python-geventhttpclient: Fix test failure., guix-commits, 2018/12/03
- 03/11: gnu: kicad: Fix build with Boost >= 1.68.,
guix-commits <=
- 02/11: gnu: python-greenlet: Update to 0.4.15., guix-commits, 2018/12/03
- 06/11: gnu: python-dask: Update to 1.0.0., guix-commits, 2018/12/03
- 08/11: gnu: python-scikit-image: Propagate six and numpy., guix-commits, 2018/12/03
- 11/11: gnu: python-cryptography: Update to 2.4.2., guix-commits, 2018/12/03
- 05/11: gnu: python-cloudpickle: Update to 0.6.1., guix-commits, 2018/12/03
- 09/11: gnu: python-scikit-learn: Update source hash., guix-commits, 2018/12/03