From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 38440@debbugs.gnu.org
Subject: [bug#38440] [PATCH 2/5] gnu: sddm: Use qt-build-system.
Date: Sat, 30 Nov 2019 23:00:52 +0100 [thread overview]
Message-ID: <20191130220055.19069-2-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com>
* gnu/packages/display-managers.scm (sddm): Use qt-build-sytem.
[arguments]<modules, imported-modules>: Remove. <phases>: Base
on phases from qt-build-system. {wrap-programs}: Remove.
---
gnu/packages/display-managers.scm | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 21afc0ec5c..75eab48572 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -27,6 +27,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system qt)
#:use-module (guix build-system gnu)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -62,7 +63,7 @@
(sha256
(base32
"0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh"))))
- (build-system cmake-build-system)
+ (build-system qt-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)
@@ -105,24 +106,13 @@
(assoc-ref %outputs "out") "/lib/qt5/qml")
(string-append "-DCMAKE_INSTALL_SYSCONFDIR="
(assoc-ref %outputs "out") "/etc"))
- #: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
+ (modify-phases (@ (guix build qt-build-system) %standard-phases)
(add-after 'unpack 'embed-loginctl-reference
(lambda _
(substitute* "CMakeLists.txt"
(("/usr/bin/loginctl") (which "loginctl")))
- #t))
- (add-after 'install 'wrap-programs
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-qt-program out "sddm")
- (wrap-qt-program out "sddm-greeter")
- #t))))))
+ #t)))))
(synopsis "QML based X11 and Wayland display manager")
(description "SDDM is a display manager for X11 and Wayland aiming to be
fast, simple and beautiful. SDDM is themeable and puts no restrictions on the
--
2.21.0
next prev parent reply other threads:[~2019-11-30 22:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-30 21:59 [bug#38440] [PATCH 0/5] Add the `qt` build-system Hartmut Goebel
2019-11-30 22:00 ` [bug#38440] [PATCH 1/5] guix: Add the 'qt' build system Hartmut Goebel
2019-11-30 22:00 ` Hartmut Goebel [this message]
2019-11-30 22:00 ` [bug#38440] [PATCH 3/5] gnu: ktouch: Use qt-build-system Hartmut Goebel
2019-11-30 22:00 ` [bug#38440] [PATCH 4/5] gnu: kdeconnect: " Hartmut Goebel
2019-11-30 22:00 ` [bug#38440] [PATCH 5/5] gnu: quaternion: " Hartmut Goebel
2019-11-30 22:15 ` [bug#38440] [PATCH 0/5] Add the `qt` build-system Brett Gilio
2019-12-01 19:28 ` bug#38440: " Hartmut Goebel
2019-11-30 22:17 ` [bug#38440] [PATCH v2] guix: Add the 'qt' build system Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191130220055.19069-2-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=38440@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).