nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: kicad: Don't hardcode version numbers. 

* gnu/packages/engineering.scm (kicad)[source]: Replace hardcoded
version number with parameterized one.
[arguments]: Same.
This commit is contained in:
Efraim Flashner 2018-12-16 23:07:44 +02:00
parent 4ae16f9c4e
commit 917f5ee75c
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/engineering.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
@ -691,8 +691,8 @@ language.")
(method url-fetch) (method url-fetch)
(file-name (string-append name "-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz"))
(uri (string-append (uri (string-append
"https://launchpad.net/kicad/5.0/" version "/+download/" name "https://launchpad.net/kicad/" (version-major+minor version)
"-" version ".tar.xz")) "/" version "/+download/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p")))) (base32 "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p"))))
(build-system cmake-build-system) (build-system cmake-build-system)
@ -711,7 +711,9 @@ language.")
;; headers in the wxwidgets store item, but in wxPython. ;; headers in the wxwidgets store item, but in wxPython.
(string-append "-DCMAKE_CXX_FLAGS=-I" (string-append "-DCMAKE_CXX_FLAGS=-I"
(assoc-ref %build-inputs "wxpython") (assoc-ref %build-inputs "wxpython")
"/include/wx-3.0") "/include/wx-"
,(version-major+minor
(package-version python2-wxpython)))
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
"-DKICAD_SPICE=TRUE" "-DKICAD_SPICE=TRUE"
;; TODO: Enable this when CA certs are working with curl. ;; TODO: Enable this when CA certs are working with curl.
@ -733,7 +735,10 @@ language.")
(file (string-append out "/bin/kicad")) (file (string-append out "/bin/kicad"))
(path (string-append (path (string-append
out out
"/lib/python2.7/site-packages:" "/lib/python"
,(version-major+minor
(package-version python))
"/site-packages:"
(getenv "PYTHONPATH")))) (getenv "PYTHONPATH"))))
(wrap-program file (wrap-program file
`("PYTHONPATH" ":" prefix (,path)) `("PYTHONPATH" ":" prefix (,path))