mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
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.
This commit is contained in:
parent
26ba09ba35
commit
c2ffcc4425
4 changed files with 15 additions and 16 deletions
|
@ -252,7 +252,17 @@ (define-public elogind
|
||||||
(substitute* "src/login/org.freedesktop.login1.service"
|
(substitute* "src/login/org.freedesktop.login1.service"
|
||||||
(("^Exec=.*")
|
(("^Exec=.*")
|
||||||
(string-append "Exec=" (assoc-ref %outputs "out")
|
(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
|
(native-inputs
|
||||||
`(("autoconf" ,autoconf)
|
`(("autoconf" ,autoconf)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
|
@ -451,7 +461,6 @@ (define-public weston
|
||||||
`(("cairo" ,cairo-xcb)
|
`(("cairo" ,cairo-xcb)
|
||||||
("dbus" ,dbus)
|
("dbus" ,dbus)
|
||||||
("elogind" ,elogind)
|
("elogind" ,elogind)
|
||||||
("libcap" ,libcap)
|
|
||||||
("libinput" ,libinput-minimal)
|
("libinput" ,libinput-minimal)
|
||||||
("libunwind" ,libunwind)
|
("libunwind" ,libunwind)
|
||||||
("libxcursor" ,libxcursor)
|
("libxcursor" ,libxcursor)
|
||||||
|
@ -583,7 +592,6 @@ (define-public udisks
|
||||||
`(("acl" ,acl)
|
`(("acl" ,acl)
|
||||||
("libatasmart" ,libatasmart)
|
("libatasmart" ,libatasmart)
|
||||||
("libgudev" ,libgudev)
|
("libgudev" ,libgudev)
|
||||||
("libcap" ,libcap)
|
|
||||||
("polkit" ,polkit)
|
("polkit" ,polkit)
|
||||||
("util-linux" ,util-linux)))
|
("util-linux" ,util-linux)))
|
||||||
(outputs '("out"
|
(outputs '("out"
|
||||||
|
@ -684,8 +692,7 @@ (define-public accountsservice
|
||||||
("intltool" ,intltool)
|
("intltool" ,intltool)
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("libcap" ,libcap)
|
`(("shadow" ,shadow)
|
||||||
("shadow" ,shadow)
|
|
||||||
("polkit" ,polkit)))
|
("polkit" ,polkit)))
|
||||||
(home-page "http://www.freedesktop.org/wiki/Software/AccountsService/")
|
(home-page "http://www.freedesktop.org/wiki/Software/AccountsService/")
|
||||||
(synopsis "D-Bus interface for user account query and manipulation")
|
(synopsis "D-Bus interface for user account query and manipulation")
|
||||||
|
@ -782,8 +789,7 @@ (define-public modem-manager
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("glib" ,glib))) ; required by mm-glib.pc
|
`(("glib" ,glib))) ; required by mm-glib.pc
|
||||||
(inputs
|
(inputs
|
||||||
`(("libcap" ,libcap)
|
`(("libgudev" ,libgudev)
|
||||||
("libgudev" ,libgudev)
|
|
||||||
("libmbim" ,libmbim)
|
("libmbim" ,libmbim)
|
||||||
("libqmi" ,libqmi)
|
("libqmi" ,libqmi)
|
||||||
("polkit" ,polkit)))
|
("polkit" ,polkit)))
|
||||||
|
|
|
@ -2781,7 +2781,6 @@ (define-public colord
|
||||||
("lcms" ,lcms)))
|
("lcms" ,lcms)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("dbus-glib" ,dbus-glib)
|
`(("dbus-glib" ,dbus-glib)
|
||||||
("libcap" ,libcap)
|
|
||||||
("libgudev" ,libgudev)
|
("libgudev" ,libgudev)
|
||||||
("libusb" ,libusb)
|
("libusb" ,libusb)
|
||||||
("sqlite" ,sqlite)
|
("sqlite" ,sqlite)
|
||||||
|
@ -4503,7 +4502,6 @@ (define-public gnome-session
|
||||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||||
("gtk+" ,gtk+)
|
("gtk+" ,gtk+)
|
||||||
("json-glib" ,json-glib)
|
("json-glib" ,json-glib)
|
||||||
("libcap" ,libcap)
|
|
||||||
("libsm" ,libsm)
|
("libsm" ,libsm)
|
||||||
("libxcomposite" ,libxcomposite)
|
("libxcomposite" ,libxcomposite)
|
||||||
("libxtst" ,libxtst)
|
("libxtst" ,libxtst)
|
||||||
|
@ -4739,7 +4737,6 @@ (define-public mutter
|
||||||
`(("elogind" ,elogind)
|
`(("elogind" ,elogind)
|
||||||
("gnome-desktop" ,gnome-desktop)
|
("gnome-desktop" ,gnome-desktop)
|
||||||
("libcanberra-gtk" ,libcanberra)
|
("libcanberra-gtk" ,libcanberra)
|
||||||
("libcap" ,libcap)
|
|
||||||
("libgudev" ,libgudev)
|
("libgudev" ,libgudev)
|
||||||
("libice" ,libice)
|
("libice" ,libice)
|
||||||
("libsm" ,libsm)
|
("libsm" ,libsm)
|
||||||
|
@ -5023,7 +5020,6 @@ (define-public network-manager
|
||||||
("iptables" ,iptables)
|
("iptables" ,iptables)
|
||||||
("isc-dhcp" ,isc-dhcp)
|
("isc-dhcp" ,isc-dhcp)
|
||||||
("jansson" ,jansson)
|
("jansson" ,jansson)
|
||||||
("libcap" ,libcap)
|
|
||||||
("libgcrypt" ,libgcrypt)
|
("libgcrypt" ,libgcrypt)
|
||||||
("libgudev" ,libgudev)
|
("libgudev" ,libgudev)
|
||||||
("libndp" ,libndp)
|
("libndp" ,libndp)
|
||||||
|
@ -5254,7 +5250,6 @@ (define-public gdm
|
||||||
("gtk+" ,gtk+)
|
("gtk+" ,gtk+)
|
||||||
("iso-codes" ,iso-codes)
|
("iso-codes" ,iso-codes)
|
||||||
("libcanberra" ,libcanberra)
|
("libcanberra" ,libcanberra)
|
||||||
("libcap" ,libcap)
|
|
||||||
("linux-pam" ,linux-pam)))
|
("linux-pam" ,linux-pam)))
|
||||||
(synopsis "Display manager for GNOME")
|
(synopsis "Display manager for GNOME")
|
||||||
(home-page "https://wiki.gnome.org/Projects/GDM/")
|
(home-page "https://wiki.gnome.org/Projects/GDM/")
|
||||||
|
|
|
@ -81,7 +81,6 @@ (define-public polkit
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("expat" ,expat)
|
`(("expat" ,expat)
|
||||||
("libcap" ,libcap)
|
|
||||||
("linux-pam" ,linux-pam)
|
("linux-pam" ,linux-pam)
|
||||||
("elogind" ,elogind)
|
("elogind" ,elogind)
|
||||||
("mozjs" ,mozjs)
|
("mozjs" ,mozjs)
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
|
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
|
||||||
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
|
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
|
||||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
;;; 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 © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
|
||||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||||
|
@ -239,8 +239,7 @@ (define-public kmscon
|
||||||
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
|
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
|
||||||
("docbook-xsl" ,docbook-xsl)))
|
("docbook-xsl" ,docbook-xsl)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("libcap" ,libcap)
|
`(("libdrm" ,libdrm)
|
||||||
("libdrm" ,libdrm)
|
|
||||||
("libtsm" ,libtsm)
|
("libtsm" ,libtsm)
|
||||||
("libxkbcommon" ,libxkbcommon)
|
("libxkbcommon" ,libxkbcommon)
|
||||||
("logind" ,elogind)
|
("logind" ,elogind)
|
||||||
|
|
Loading…
Reference in a new issue