nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: dbus: Drop patch. 

* gnu/packges/patches/dbus-localstatedir.patch: Remove file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/glib.scm (dbus): Remove patch.
  [argumests]: Remove 'post-install' phase.  Don't create
  localestatedir and sysconfdir in the 'install' phase.
This commit is contained in:
宋文武 2015-10-01 09:58:33 +08:00
parent 53b5856ac1
commit 25087f60b6
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu-system.am
View File

@ -427,7 +427,6 @@ dist_patch_DATA = \
gnu/packages/patches/cssc-missing-include.patch \ gnu/packages/patches/cssc-missing-include.patch \
gnu/packages/patches/clucene-contribs-lib.patch \ gnu/packages/patches/clucene-contribs-lib.patch \
gnu/packages/patches/cursynth-wave-rand.patch \ gnu/packages/patches/cursynth-wave-rand.patch \
gnu/packages/patches/dbus-localstatedir.patch \
gnu/packages/patches/dealii-p4est-interface.patch \ gnu/packages/patches/dealii-p4est-interface.patch \
gnu/packages/patches/diffutils-gets-undeclared.patch \ gnu/packages/patches/diffutils-gets-undeclared.patch \
gnu/packages/patches/dfu-programmer-fix-libusb.patch \ gnu/packages/patches/dfu-programmer-fix-libusb.patch \

38
gnu/packages/glib.scm
View File

@ -60,18 +60,23 @@
(version "1.10.0") (version "1.10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri (string-append
(string-append "http://dbus.freedesktop.org/releases/dbus/dbus-" "http://dbus.freedesktop.org/releases/dbus/dbus-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx")) "0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx"))))
(patches (list (search-patch "dbus-localstatedir.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags (list ;; Install the system bus socket under /var. '(#:configure-flags
(list
;; Install the system bus socket under /var.
"--localstatedir=/var" "--localstatedir=/var"
;; Install the session bus socket under /tmp.
"--with-session-socket-dir=/tmp"
;; Use /etc/dbus-1 for system-wide config.
;; Look for configuration file under ;; Look for configuration file under
;; /etc/dbus-1. This is notably required by ;; /etc/dbus-1. This is notably required by
;; 'dbus-daemon-launch-helper', which looks for ;; 'dbus-daemon-launch-helper', which looks for
@ -79,19 +84,16 @@
;; regardless of what '--config-file' was ;; regardless of what '--config-file' was
;; passed to 'dbus-daemon' on the command line; ;; passed to 'dbus-daemon' on the command line;
;; see <https://bugs.freedesktop.org/show_bug.cgi?id=92458>. ;; see <https://bugs.freedesktop.org/show_bug.cgi?id=92458>.
"--sysconfdir=/etc" "--sysconfdir=/etc")
#:phases
"--with-session-socket-dir=/tmp") (modify-phases %standard-phases
#:phases (alist-cons-after (replace 'install
'install 'post-install (lambda _
(lambda* (#:key outputs #:allow-other-keys) ;; Don't try to create /var and /etc.
;; 'dbus-launch' bails out if the 'session.d' directory (system* "make"
;; below is missing, so create it along with its companion. "localstatedir=/tmp/dummy"
(let ((out (assoc-ref outputs "out"))) "sysconfdir=/tmp/dummy"
(mkdir (string-append out "/etc/dbus-1/session.d")) "install"))))))
(mkdir (string-append out "/etc/dbus-1/system.d"))
#t))
%standard-phases)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs