TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: ktouch: Use qt-build-system.

Browse source 
* gnu/packages/display-managers.scm (ktouch): Use qt-build-sytem.
  [arguments]<modules, imported-modules>: Remove. <phases>: Base
  on phases from qt-build-system. {wrap-executables}: Remove.
This commit is contained in:
Hartmut Goebel 2019-11-30 22:39:55 +01:00
parent 2f57e34bf3
commit 7d796d8068
No known key found for this signature in database
GPG key ID: 634A8DFFD3F631DF
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/education.scm
View file

@ -58,6 +58,7 @@ (define-module (gnu packages education)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix build-system trivial)
#:use-module (srfi srfi-1))
@ -563,15 +564,10 @@ (define-public ktouch
(sha256
(base32
"19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr"))))
(build-system cmake-build-system)
(build-system qt-build-system)
(arguments
`(#:modules ((guix build cmake-build-system)
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
(guix build qt-utils))
#:phases
(modify-phases %standard-phases
`(#:phases
(modify-phases (@ (guix build qt-build-system) %standard-phases)
(add-after 'configure 'patch-makefiles
(lambda* (#:key inputs #:allow-other-keys)
(let ((qtdec (assoc-ref inputs "qtdeclarative")))
@ -579,11 +575,6 @@ (define-public ktouch
"src/CMakeFiles/ktouch.dir/build.make")
(("/gnu/store/.*qmlcachegen")
(string-append qtdec "/bin/qmlcachegen"))))
#t))
(add-after 'install 'wrap-executable
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-qt-program out "ktouch"))
#t)))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)