diff mbox

[v4,3/3] gnu: Add kicad.

Message ID 20161107181628.23640-3-theodoros.for@openmailbox.org
State New
Headers show

Commit Message

Theodoros Foradis Nov. 7, 2016, 6:16 p.m. UTC
* gnu/packages/engineering.scm (kicad): New variable.
---
 gnu/packages/engineering.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

Comments

Efraim Flashner Nov. 7, 2016, 6:47 p.m. UTC | #1
On Mon, Nov 07, 2016 at 08:16:28PM +0200, Theodoros Foradis wrote:
> * gnu/packages/engineering.scm (kicad): New variable.
> ---
>  gnu/packages/engineering.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 92 insertions(+)
> 
> +         ("wxpython" ,python2-wxpython)))
> +      (home-page "http://http://kicad-pcb.org/")

You might want to double-check that url :)
Leo Famulari Nov. 15, 2016, 7:26 p.m. UTC | #2
On Mon, Nov 07, 2016 at 08:16:28PM +0200, Theodoros Foradis wrote:
> * gnu/packages/engineering.scm (kicad): New variable.

There are some comments about minor issues on this version 3 of the
patch series. I can address these myself before pushing if there are no
more comments. I will read the patches one more time, test the build,
and push tomorrow if there are no more comments.

Thanks to everyone who was worked on this! It's a big group :)
Theodoros Foradis Nov. 22, 2016, 7:46 p.m. UTC | #3
Leo Famulari writes:

> On Mon, Nov 07, 2016 at 08:16:28PM +0200, Theodoros Foradis wrote:
>> * gnu/packages/engineering.scm (kicad): New variable.
>
> There are some comments about minor issues on this version 3 of the
> patch series. I can address these myself before pushing if there are no
> more comments. I will read the patches one more time, test the build,
> and push tomorrow if there are no more comments.
>
> Thanks to everyone who was worked on this! It's a big group :)

Hello,

I have posted a version 5 of the patch series, which I have not
commented on. It (hopefully) includes the fixes, based on the comments
on previous patch series.

It contains an extra patch, with the kicad-library package, which
includes components, footprints and 3D models for kicad.

Regards,
Leo Famulari Nov. 25, 2016, 5:40 a.m. UTC | #4
On Tue, Nov 22, 2016 at 09:46:17PM +0200, Theodoros Foradis wrote:
> 
> Leo Famulari writes:
> 
> > On Mon, Nov 07, 2016 at 08:16:28PM +0200, Theodoros Foradis wrote:
> >> * gnu/packages/engineering.scm (kicad): New variable.
> >
> > There are some comments about minor issues on this version 3 of the
> > patch series. I can address these myself before pushing if there are no
> > more comments. I will read the patches one more time, test the build,
> > and push tomorrow if there are no more comments.
> >
> > Thanks to everyone who was worked on this! It's a big group :)
> 
> Hello,
> 
> I have posted a version 5 of the patch series, which I have not
> commented on. It (hopefully) includes the fixes, based on the comments
> on previous patch series.
> 
> It contains an extra patch, with the kicad-library package, which
> includes components, footprints and 3D models for kicad.

I fixed some minor cosmetic issues (long lines, indentation, etc) and
also made some minor edits to descriptions and comments, and pushed the
v5 patch series, ending with 8f528bd4426fdb3e6e571316b185e70d30485c7e.

Thanks a lot everyone!
diff mbox

Patch

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 829ceb0..3d7c6ce 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -4,6 +4,7 @@ 
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,6 +30,7 @@ 
   #:use-module (guix store)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
   #:use-module (gnu packages)
@@ -39,6 +41,7 @@ 
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gd)
@@ -55,9 +58,14 @@ 
   #:use-module (gnu packages maths)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages swig)
   #:use-module (gnu packages tcl)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages tex)
+  #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages xorg)
   #:use-module (srfi srfi-1))
 
 (define-public librecad
@@ -562,3 +570,87 @@  fundamental, primitive shapes are represented as code in the user-level
 language.")
       (license (list license:lgpl2.1+             ;library
                      license:gpl2+)))))           ;Guile bindings
+
+;; We use kicad from a git commit, because support for boost 1.61.0
+;; has been recently added.
+(define-public kicad
+  (let ((commit "4ee344e150bfaf3a6f3f7bf935fb96ae07c423fa")
+        (revision "1"))
+    (package
+      (name "kicad")
+      (version (string-append "4.0-" revision "."
+                              (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.launchpad.net/kicad")
+               (commit commit)))
+         (sha256
+          (base32 "0kf6r92nps0658i9n3p9vp5dzbssmc22lvjv5flyvnlf83l63s4n"))
+         (file-name (string-append name "-" version "-checkout"))))
+      (build-system cmake-build-system)
+      (arguments
+       `(#:out-of-source? #t
+         #:tests? #f ; no tests
+         #:configure-flags
+           (list "-DKICAD_STABLE_VERSION=ON"
+                 "-DKICAD_REPO_NAME=stable"
+                 ,(string-append "-DKICAD_BUILD_VERSION=4.0-"
+                                 (string-take commit 7))
+                 "-DCMAKE_BUILD_TYPE=Release"
+                 "-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 explicitely, 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-3.0")
+                 "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"
+                 ;; TODO: enable this when CA certs are working with curl
+                 "-DBUILD_GITHUB_PLUGIN=OFF")
+           #:phases
+             (modify-phases %standard-phases
+               (add-after 'install 'wrap-program ; Ensure correct python at runtime
+                          (lambda* (#:key inputs outputs #:allow-other-keys)
+                            (let* ((out (assoc-ref outputs "out"))
+                                   (python (assoc-ref inputs "python"))
+                                   (file (string-append out "/bin/kicad"))
+                                   (path (string-append
+                                          out
+                                          "/lib/python2.7/site-packages:"
+                                          (getenv "PYTHONPATH"))))
+                              (wrap-program file
+                                `("PYTHONPATH" ":" prefix (,path))
+                                `("PATH" ":" prefix
+                                  (,(string-append python "/bin:")))))
+                            #t)))))
+      (native-inputs
+       `(("boost" ,boost)
+         ("gettext" ,gnu-gettext)
+         ("pkg-config" ,pkg-config)
+         ("swig" ,swig)
+         ("zlib" ,zlib)))
+      (inputs
+       `(("cairo" ,cairo)
+         ("curl" ,curl)
+         ("desktop-file-utils" ,desktop-file-utils)
+         ("glew" ,glew)
+         ("glm" ,glm)
+         ("hicolor-icon-theme" ,hicolor-icon-theme)
+         ("libsm" ,libsm)
+         ("mesa" ,mesa)
+         ("openssl" ,openssl)
+         ("python" ,python-2)
+         ("wxwidgets" ,wxwidgets-gtk2)
+         ("wxpython" ,python2-wxpython)))
+      (home-page "http://http://kicad-pcb.org/")
+      (synopsis "Electronics Design Automation Suite")
+      (description
+       "Kicad is created for the formation of printed circuit boards and electrical circuits.
+ The software has a number of programs that perform specific functions, for example,
+ pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber
+ files) and others. ")
+      (license license:gpl3+))))