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

gnu: cmst: Don't install files to usr. 

* gnu/packages/connman.scm (cmst)[arguments]: Move custom 'fix-Makefiles
phase before 'build. Add more substitutions.
This commit is contained in:
Efraim Flashner 2019-06-17 09:28:42 +03:00
parent 9e3e80baa3
commit 55350f8316
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/connman.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@ -160,13 +160,22 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.")
(invoke "qmake" (invoke "qmake"
(string-append "PREFIX=" (string-append "PREFIX="
(assoc-ref outputs "out"))))) (assoc-ref outputs "out")))))
(add-before 'install 'fix-Makefiles (add-before 'build 'fix-Makefiles
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "Makefile") (substitute* (find-files "." "Makefile")
(("INSTALL_ROOT)") (("INSTALL_ROOT)")
(string-append "INSTALL_ROOT)" out)) (string-append "INSTALL_ROOT)" out))
(("/usr/bin") "/bin")))))))) (("/usr") ""))
(substitute* '("apps/cmstapp/cmstapp.pro"
"apps/cmstapp/code/control_box/controlbox.cpp"
"apps/rootapp/rootapp.pro"
"apps/rootapp/system/org.cmst.roothelper.service"
"cmst.pri"
"cmst.pro")
(("/usr") out)
(("/etc") (string-append out "/etc")))
#t))))))
(home-page "https://github.com/andrew-bibb/cmst") (home-page "https://github.com/andrew-bibb/cmst")
(synopsis "Qt frontend for Connman") (synopsis "Qt frontend for Connman")
(description (description