From 562c3a4e12b305bb549ed920d0954d9018f158eb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Apr 2021 11:32:57 +0300 Subject: gnu: keepassxc: Wrap binary with wrap-qt-program. * gnu/packages/password-utils.scm (keepassxc)[arguments]: Import qt-utils module. Replace custom 'wrap-bin phase with 'wrap-qt phase. --- gnu/packages/password-utils.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index d7942a0f8b..ef091fd126 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Steve Sprang -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2015 Aljosha Papsch ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Jessica Tallon @@ -136,19 +136,18 @@ human.") (base32 "0azq20rqsx7axrigha4qh81ipvhqnnlb27w3xdjg5z4h3jky4dp5")))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DWITH_XC_ALL=YES" + `(#:modules ((guix build cmake-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build qt-utils)) + #:configure-flags '("-DWITH_XC_ALL=YES" "-DWITH_XC_UPDATECHECK=NO") #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-bin - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/keepassxc") - `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs label) - "/lib/qt5/plugins")) - '("qtbase" "qtsvg"))))) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "keepassxc") #t))))) (native-inputs `(("asciidoctor" ,ruby-asciidoctor) -- cgit 1.4.1