aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-09-07 11:06:25 +0200
committerLudovic Courtès <ludo@gnu.org>2017-09-07 13:57:42 +0200
commitc2ffcc4425946725f843466680b89b9b0aa1f45e (patch)
treee654e3b0ecc413991c597c438d2eb5556b2227b7
parent26ba09ba356fa7ce35ba0a337be5a30987a3c729 (diff)
downloadguix-c2ffcc4425946725f843466680b89b9b0aa1f45e.tar
guix-c2ffcc4425946725f843466680b89b9b0aa1f45e.tar.gz
gnu: elogind: Add '-L' flag for libcap in libelogind.la.
This fix allows us to revert this series of commits: 1b97e9261 * gnu: gdm: Add missing input. de0c89f18 * gnu: colord: Add missing input. 7e38ba654 * gnu: accountsservice: Add missing input. 166bc1b25 * gnu: network-manager: Add missing input. daae20894 * gnu: modem-manager: Add missing input. 1f919459e * gnu: udisks: Add missing input. 744e9d074 * gnu: mutter: Add missing input. 0cce140dc * gnu: gnome-session: Add missing input. 77c2476ae * gnu: polkit: Add missing input. 124ac301c * gnu: weston: Add missing input. 472c2223c * gnu: kmscon: Add missing input. * gnu/packages/freedesktop.scm (elogind)[arguments]: Add 'add-libcap-to-search-path' phase. (weston)[inputs]: Remove LIBCAP. (udisks): Likewise. (accountsservice): Likewise. (modem-manager): Likewise. * gnu/packages/gnome.scm (colord): Likewise (gnome-session): Likewise. (mutter): Likewise. (network-manager): Likewise. (gdm): Likewise. * gnu/packages/polkit.scm (polkit): Likewise. * gnu/packages/terminals.scm (kmscon): Likewise.
-rw-r--r--gnu/packages/freedesktop.scm20
-rw-r--r--gnu/packages/gnome.scm5
-rw-r--r--gnu/packages/polkit.scm1
-rw-r--r--gnu/packages/terminals.scm5
4 files changed, 15 insertions, 16 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 89dab53cbc..83374bce6e 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -252,7 +252,17 @@ the freedesktop.org XDG Base Directory specification.")
(substitute* "src/login/org.freedesktop.login1.service"
(("^Exec=.*")
(string-append "Exec=" (assoc-ref %outputs "out")
- "/libexec/elogind/elogind\n"))))))))
+ "/libexec/elogind/elogind\n")))))
+ (add-after 'install 'add-libcap-to-search-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Add a missing '-L' for libcap in libelogind.la. See
+ ;; <https://lists.gnu.org/archive/html/guix-devel/2017-09/msg00084.html>.
+ (let ((libcap (assoc-ref inputs "libcap"))
+ (out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/lib/libelogind.la")
+ (("-lcap")
+ (string-append "-L" libcap "/lib -lcap")))
+ #t))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
@@ -451,7 +461,6 @@ applications, X servers (rootless or fullscreen) or other display servers.")
`(("cairo" ,cairo-xcb)
("dbus" ,dbus)
("elogind" ,elogind)
- ("libcap" ,libcap)
("libinput" ,libinput-minimal)
("libunwind" ,libunwind)
("libxcursor" ,libxcursor)
@@ -583,7 +592,6 @@ Analysis and Reporting Technology) functionality.")
`(("acl" ,acl)
("libatasmart" ,libatasmart)
("libgudev" ,libgudev)
- ("libcap" ,libcap)
("polkit" ,polkit)
("util-linux" ,util-linux)))
(outputs '("out"
@@ -684,8 +692,7 @@ message bus.")
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
- `(("libcap" ,libcap)
- ("shadow" ,shadow)
+ `(("shadow" ,shadow)
("polkit" ,polkit)))
(home-page "http://www.freedesktop.org/wiki/Software/AccountsService/")
(synopsis "D-Bus interface for user account query and manipulation")
@@ -782,8 +789,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
(propagated-inputs
`(("glib" ,glib))) ; required by mm-glib.pc
(inputs
- `(("libcap" ,libcap)
- ("libgudev" ,libgudev)
+ `(("libgudev" ,libgudev)
("libmbim" ,libmbim)
("libqmi" ,libqmi)
("polkit" ,polkit)))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 339436f272..113c8e5a2f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2781,7 +2781,6 @@ keyboard shortcuts.")
("lcms" ,lcms)))
(inputs
`(("dbus-glib" ,dbus-glib)
- ("libcap" ,libcap)
("libgudev" ,libgudev)
("libusb" ,libusb)
("sqlite" ,sqlite)
@@ -4503,7 +4502,6 @@ such as gzip tarballs.")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
- ("libcap" ,libcap)
("libsm" ,libsm)
("libxcomposite" ,libxcomposite)
("libxtst" ,libxtst)
@@ -4739,7 +4737,6 @@ to display dialog boxes from the commandline and shell scripts.")
`(("elogind" ,elogind)
("gnome-desktop" ,gnome-desktop)
("libcanberra-gtk" ,libcanberra)
- ("libcap" ,libcap)
("libgudev" ,libgudev)
("libice" ,libice)
("libsm" ,libsm)
@@ -5023,7 +5020,6 @@ users.")
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
("jansson" ,jansson)
- ("libcap" ,libcap)
("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev)
("libndp" ,libndp)
@@ -5254,7 +5250,6 @@ libxml2.")
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("libcanberra" ,libcanberra)
- ("libcap" ,libcap)
("linux-pam" ,linux-pam)))
(synopsis "Display manager for GNOME")
(home-page "https://wiki.gnome.org/Projects/GDM/")
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 11c825ef34..0e38dd61ee 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -81,7 +81,6 @@
(build-system gnu-build-system)
(inputs
`(("expat" ,expat)
- ("libcap" ,libcap)
("linux-pam" ,linux-pam)
("elogind" ,elogind)
("mozjs" ,mozjs)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index db61915955..a9682b685c 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@@ -239,8 +239,7 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.")
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("docbook-xsl" ,docbook-xsl)))
(inputs
- `(("libcap" ,libcap)
- ("libdrm" ,libdrm)
+ `(("libdrm" ,libdrm)
("libtsm" ,libtsm)
("libxkbcommon" ,libxkbcommon)
("logind" ,elogind)