summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac <arunisaac@systemreboot.net>2019-11-03 19:15:12 +0530
committerArun Isaac <arunisaac@systemreboot.net>2019-11-05 19:51:20 +0530
commitf648d681bebf04b01e3b2d0e8dd4d8f6e9084acb (patch)
tree3e433bfc6c73f64cb28d1db3db6501916439a926
parent2c0552cf95cf2b0cb91fca20231c3b5f4ff606b4 (diff)
downloadpatches-f648d681bebf04b01e3b2d0e8dd4d8f6e9084acb.tar
patches-f648d681bebf04b01e3b2d0e8dd4d8f6e9084acb.tar.gz
gnu: kicad: Update to 5.1.4.
* gnu/packages/engineering.scm (kicad): Update to 5.1.4. [arguments]: Remove unrecognized flags and flags that are redundant because they specify default values. Use python 3 and the "Phoenix" version of wxPython. Enable the GitHub plugin for pcbnew. Remove adjust-boost-include phase. [inputs]: Replace python-2 with python, wxwidgets-gtk2 with wxwidgets and python2-wxpython with python-wxpython.
-rw-r--r--gnu/packages/engineering.scm41
1 files changed, 10 insertions, 31 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index d1626f0342..2c5ae53317 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -767,48 +767,27 @@ language.")
(define-public kicad
(package
(name "kicad")
- (version "5.0.2")
+ (version "5.1.4")
(source
(origin
(method url-fetch)
(file-name (string-append name "-" version ".tar.xz"))
(uri (string-append
- "https://launchpad.net/kicad/" (version-major+minor version)
- "/" version "/+download/kicad-" version ".tar.xz"))
+ "https://launchpad.net/kicad/" (version-major version)
+ ".0/" version "/+download/kicad-" version ".tar.xz"))
(sha256
- (base32 "10605rr10x0353n6yk2z095ydnkd1i6j1ncbq64pfxdn5vkhcd1g"))))
+ (base32 "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j"))))
(build-system cmake-build-system)
(arguments
`(#:out-of-source? #t
#:tests? #f ; no tests
#:build-type "Release"
#:configure-flags
- (list "-DKICAD_STABLE_VERSION=ON"
- "-DKICAD_REPO_NAME=stable"
- "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library.
- "-DKICAD_SCRIPTING=ON"
- "-DKICAD_SCRIPTING_MODULES=ON"
- "-DKICAD_SCRIPTING_WXPYTHON=ON"
- ;; Has to be set explicitly, as we don't have the wxPython
- ;; headers in the wxwidgets store item, but in wxPython.
- (string-append "-DCMAKE_CXX_FLAGS=-I"
- (assoc-ref %build-inputs "wxpython")
- "/include/wx-"
- ,(version-major+minor
- (package-version python2-wxpython)))
- "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
- "-DKICAD_SPICE=TRUE"
- ;; TODO: Enable this when CA certs are working with curl.
- "-DBUILD_GITHUB_PLUGIN=OFF")
+ (list "-DKICAD_SCRIPTING_PYTHON3=ON"
+ "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
+ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
#: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)
@@ -845,9 +824,9 @@ language.")
("mesa" ,mesa)
("opencascade-oce" ,opencascade-oce)
("openssl" ,openssl)
- ("python" ,python-2)
- ("wxwidgets" ,wxwidgets-gtk2)
- ("wxpython" ,python2-wxpython)))
+ ("python" ,python)
+ ("wxwidgets" ,wxwidgets)
+ ("wxpython" ,python-wxpython)))
(home-page "http://kicad-pcb.org/")
(synopsis "Electronics Design Automation Suite")
(description "Kicad is a program for the formation of printed circuit