diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-04-29 23:24:09 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-04-29 23:24:09 +0200 |
| commit | d583fca6afc2cf940130d28061704f10fe5839ee (patch) | |
| tree | 938248795fc1ee496f0b00b401234b59a98be4be | |
| parent | afec15a3eb3e729d3e9e18c0074e2b133f0f2a83 (diff) | |
non-free: tek: Fix build.
* non-free/custom/packages/wip.scm (tek): Fix build.
| -rw-r--r-- | non-free/custom/packages/wip.scm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/non-free/custom/packages/wip.scm b/non-free/custom/packages/wip.scm index c9441ae..b7ec03e 100644 --- a/non-free/custom/packages/wip.scm +++ b/non-free/custom/packages/wip.scm @@ -1,4 +1,4 @@ -;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is not part of GNU Guix but is distributed under the same ;;; license as GNU Guix. @@ -42,19 +42,18 @@ "1rpzfs7zsdj9in1rcy5lncjpsmz05wk58ix62zvy2gzqkds463kk")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("LIN_CXX=gcc") - #:parallel-build? #f + `(#:tests? #f ; no tests! + #:make-flags '("LIN_CXX=g++") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-order - (lambda _ - (substitute* "Makefile" - (("\\$\\(LIN_CXX\\) -c \\$\\(CXXFLAGS\\) `\\$\\(LIN_WXCONFIG\\) --cxxflags` \\$\\(filter %.cpp,\\$\\^\\) -o \\$@") - "$(LIN_CXX) -o $@ -c $(CXXFLAGS) `$(LIN_WXCONFIG) --cxxflags` $(filter %.cpp,$^)") - (("\\$\\(LIN_CXX\\) \\$\\(CXXFLAGS\\) \\$\\^ `\\$\\(LIN_WXCONFIG\\) --libs` -lusb-1.0 -o \\$@") - "$(LIN_CXX) $(CXXFLAGS) $^ -o $@ `$(LIN_WXCONFIG) --libs` -lusb-1.0")) - #t)) - (delete 'configure)))) + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") + "/bin"))) + (mkdir-p bin) + (install-file "tek.lin" bin) + #t)))))) (inputs `(("wxwidgets" ,wxwidgets) ("libusb" ,libusb))) @@ -63,5 +62,7 @@ (home-page "https://github.com/m-ou-se/tek") (synopsis "Firmware upgrade tool for the Truly Ergonomic keyboard") (description - "TODO") + "This package provides a firmware upgrade tool for keyboards made +by Truly Ergonomic.") + ;; TODO (license license:gpl3+))) |