me
/
guix
Archived
1
0
Fork 0
Code

gnu: kdeconnect: Use qt-build-system. 

* gnu/packages/display-managers.scm (kdeconnect): Use qt-build-sytem.
  [arguments]<modules, imported-modules>: Remove. <phases>: Base
  on phases from qt-build-system. {wrap-executable}: Remove.
master
Hartmut Goebel 2019-11-30 22:43:23 +01:00
parent 7d796d8068
commit e185e900e5
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/kde.scm
View File

@ -24,6 +24,7 @@
(define-module (gnu packages kde) (define-module (gnu packages kde)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system qt)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -541,28 +542,15 @@ different notification systems.")
(sha256 (sha256
(base32 (base32
"02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5")))) "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"))))
(build-system cmake-build-system) (build-system qt-build-system)
(arguments (arguments
`(#:configure-flags '("-DBUILD_TESTING=ON") `(#:configure-flags '("-DBUILD_TESTING=ON")
#:tests? #f ; tests fail hard in our build environment #:tests? #f ; tests fail hard in our build environment
#:modules ((guix build cmake-build-system)
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
(guix build qt-utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases (@ (guix build qt-build-system) %standard-phases)
(add-before 'check 'check-setup (add-before 'check 'check-setup
(lambda _ (lambda _
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen")
#t))
(add-after 'install 'wrap-executable
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-qt-program out "../lib/libexec/kdeconnectd")
(wrap-qt-program out "kdeconnect-cli")
(wrap-qt-program out "kdeconnect-handler")
(wrap-qt-program out "kdeconnect-indicator"))
#t))))) #t)))))
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)