Patchwork Stuck on KiCad dependency wxPython

login
register
mail settings
Submitter Danny Milosavljevic
Date Sept. 22, 2016, 8:27 a.m.
Message ID <20160922102754.75e436f8@scratchpost.org>
Download mbox | patch
Permalink /patch/15889/
State New
Headers show

Comments

Danny Milosavljevic - Sept. 22, 2016, 8:27 a.m.
Hi Leo,

the part that is failing is Python distutils build_ext. It uses Python*/Lib/distutils/sysconfig.py in order to find out the flags. And that does 

distutils/sysconfig.py:            cpp = cpp + ' ' + os.environ['CPPFLAGS']
                                                     ^^^^^^^^^^^^^^^^^^^^^^

So we should set an environment variable :)

See attached (dirty) patch...

Best would be to set it to what wxwidgets' wx-config program reports (i.e. CPPFLAGS=`wx-config --cflags`) - but I don't know how to do that yet.
Danny Milosavljevic - Sept. 22, 2016, 8:45 a.m.
I just checked - the python-build-system doesn't allow passing flags when invoking setup.py . That's the only reason the custom build phase is there...

Also, I think we should adapt wxwidgets to add propagated-inputs.

Because the wxwidgets header files include opengl and gtk header files, a client using wxwidgets really requires gtk. However, the entire point of wx* is to have platform independent API - I don't think that the client package should include gtk or mesa for example. It should just include wxwidgets and that's it.

Patch

diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 31da2a9..9fbb8ed 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -22,6 +22,7 @@ 
   #:use-module (guix download)
   #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system python)
   #:use-module (guix build utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
@@ -31,6 +32,7 @@ 
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg))
@@ -109,3 +111,83 @@  and many other languages.")
                             (assoc-ref %outputs "out") "/lib"))
        ;; No 'check' target.
        #:tests? #f))))
+
+(define-public python2-wxpython
+  (package
+    (name "python-wxpython")
+    (version "3.0.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/wxpython/wxPython/"
+                                  version "/wxPython-src-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; TODO Audit fully
+                  (delete-file-recursively "src/expat")
+                  (delete-file-recursively "src/jpeg")
+                  (delete-file-recursively "src/png")
+                  (delete-file-recursively "src/tiff")
+                  (delete-file-recursively "src/zlib")
+
+
+                  (delete-file-recursively "src/msw")
+                  (delete-file-recursively "src/osx")
+                  (substitute* '("wxPython/setup.py")
+                    ;; setup.py tries to keep its own license the same as wxwidget's license (which it expects under $WXWIN/docs).
+                    (("'preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt'") ""))
+                  ))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:tests? #f
+       #:configure-flags
+       (list "--enable-unicode" ; any effect?
+             "--disable-precomp-headers"
+             "--with-regex=sys")
+       ;#:make-flags ;; there seems to be a --rpath option available already
+       ;(list (string-append "LDFLAGS=-Wl,-rpath="
+       ;                     (assoc-ref %outputs "out") "/lib"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'chdir
+           (lambda _
+             (chdir "wxPython")))
+         (add-before 'build 'setenv
+           (lambda* (#:key inputs #:allow-other-keys)
+             (setenv "WXWIN" (assoc-ref inputs "wxwidgets"))
+             ; FIXME better: just call wx-config --cppflags and set that (how?)
+             (setenv "CPPFLAGS" (string-append "-I"
+                                               (assoc-ref inputs "wxwidgets")
+                                               "/lib/wx/include/gtk3-unicode-3.0"
+                                               " -I"
+                                               (assoc-ref inputs "wxwidgets")
+                                               "/include/wx-3.0"
+                                               " -D_FILE_OFFSET_BITS=64"
+                                               " -DWXUSINGDLL"
+                                               " -D__WXGTK__"))))
+         (replace 'build
+           (lambda* (#:key inputs #:allow-other-keys)
+             (zero?
+               (system* "python" "setup.py" "WXPORT=gtk3" "UNICODE=1" "build")))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config) ; FIXME remove
+       ("python2-setuptools" ,python2-setuptools)))
+    (inputs
+     `(("expat" ,expat)
+       ("gtk+" ,gtk+) ;; FIXME shouldn't that be automatically there?
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("libtiff" ,libtiff)
+       ("libsm" ,libsm)
+       ("libx11" ,libx11)
+       ("wxwidgets" ,wxwidgets)
+       ; FIXME add opengl
+       ("zlib" ,zlib)))
+    (synopsis "Python2 Bindings for wxWidgets")
+    (description "@code{wxpython} are Python2 bindings for wxWidgets.")
+    (home-page "http://wxpython.org/")
+    (license l:fsf-free))) ; TODO Audit