amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2021-07-18 16:05:21 +02:00
commit 0e47fcced4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
251 changed files with 56329 additions and 3619 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/password-utils.scm
View file

@ -31,6 +31,8 @@
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 David Dashyan <mail@davie.li>
;;;
;;; This file is part of GNU Guix.
;;;
@ -147,9 +149,9 @@ human.")
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-qt
(lambda* (#:key outputs #:allow-other-keys)
(wrap-qt-program (assoc-ref outputs "out") "keepassxc")
#t)))))
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-qt-program "keepassxc" #:output out #:inputs inputs)))))))
(native-inputs
`(("asciidoctor" ,ruby-asciidoctor)
("qttools" ,qttools)))
@ -513,12 +515,18 @@ any X11 window.")
"}\"\n"))))
#t))
(add-before 'install 'patch-passmenu-path
;; FIXME Wayland support requires ydotool and dmenu-wl packages
;; We are ignoring part of the script that gets executed if
;; WAYLAND_DISPLAY env variable is set, leaving dmenu-wl and ydotool
;; commands as is.
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "contrib/dmenu/passmenu"
(("dmenu") (string-append (assoc-ref inputs "dmenu")
"/bin/dmenu"))
(("xdotool") (string-append (assoc-ref inputs "xdotool")
"/bin/xdotool")))
(("dmenu=dmenu\n")
(string-append "dmenu="
(assoc-ref inputs "dmenu") "/bin/dmenu\n"))
(("xdotool=\"xdotool")
(string-append "xdotool=\""
(assoc-ref inputs "xdotool") "/bin/xdotool")))
#t))
(add-after 'install 'install-passmenu
(lambda* (#:key outputs #:allow-other-keys)
@ -678,8 +686,9 @@ key URIs using the standard otpauth:// scheme.")
(install-file "qtpass.1" man)
#t)))
(add-after 'install 'wrap-qt
(lambda* (#:key outputs #:allow-other-keys)
(wrap-qt-program (assoc-ref outputs "out") "qtpass")
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-qt-program "qtpass" #:output out #:inputs inputs))
#t))
(add-before 'check 'check-setup
;; Make Qt render "offscreen", required for tests.