diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-06-17 09:28:42 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-06-17 10:02:47 +0300 |
| commit | 55350f8316f693401506e85684b3faf0627c4a80 (patch) | |
| tree | 9d09d989580a473a87ed9c566046c855ec2e9b35 /gnu | |
| parent | 9e3e80baa3d3093c3d7a80be27770b8b46f1789e (diff) | |
| download | patches-55350f8316f693401506e85684b3faf0627c4a80.tar patches-55350f8316f693401506e85684b3faf0627c4a80.tar.gz | |
gnu: cmst: Don't install files to usr.
* gnu/packages/connman.scm (cmst)[arguments]: Move custom 'fix-Makefiles
phase before 'build. Add more substitutions.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/connman.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 39262b87da..df5aa7bb6d 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -1,5 +1,5 @@ ;;; 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 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> @@ -160,13 +160,22 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.") (invoke "qmake" (string-append "PREFIX=" (assoc-ref outputs "out"))))) - (add-before 'install 'fix-Makefiles + (add-before 'build 'fix-Makefiles (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (find-files "." "Makefile") (("INSTALL_ROOT)") (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") (synopsis "Qt frontend for Connman") (description |