[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Tue, 13 Jan 2015 17:16:23 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit a813710a5fb0822e9d95088462d70f6522fe8457
Merge: d8cd159 765f0ac
Author: Mark H Weaver <address@hidden>
Date: Tue Jan 13 12:14:08 2015 -0500
Merge branch 'master' into core-updates
Makefile.am | 4 +-
doc/guix.texi | 44 ++++---
gnu-system.am | 1 -
gnu/packages/algebra.scm | 10 +-
gnu/packages/gnome.scm | 71 ++++++++--
gnu/packages/libcanberra.scm | 31 ++++-
gnu/packages/linux.scm | 30 ++++-
.../libcanberra-sound-theme-freedesktop.patch | 22 +++
gnu/packages/pdf.scm | 42 ++++++
gnu/packages/video.scm | 8 +-
gnu/packages/xdisorg.scm | 33 +++++
gnu/packages/xlockmore.scm | 52 --------
gnu/services/base.scm | 10 +-
guix/build-system/glib-or-gtk.scm | 30 +++--
guix/build/glib-or-gtk-build-system.scm | 139 +++++++++++++++++---
guix/derivations.scm | 25 ++--
guix/gexp.scm | 17 ++-
guix/monads.scm | 73 +----------
guix/sets.scm | 116 ++++++++++++++++
tests/gexp.scm | 26 ++++-
tests/lint.scm | 23 +++-
tests/monads.scm | 47 +-------
tests/sets.scm | 52 ++++++++
23 files changed, 637 insertions(+), 269 deletions(-)
diff --cc gnu/packages/libcanberra.scm
index 859740a,3d43c4f..0ffae1f
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@@ -52,12 -67,24 +67,24 @@@
`(("alsa-lib" ,alsa-lib)
("gstreamer" ,gstreamer)
("gtk+" ,gtk+)
- ("libtool" ,libtool)
+ ("libltdl" ,libltdl)
("libvorbis" ,libvorbis)
("pulseaudio" ,pulseaudio)
- ("udev" ,eudev)))
+ ("udev" ,eudev)
+ ("sound-theme-freedesktop" ,sound-theme-freedesktop)))
(native-inputs
`(("pkg-config" ,pkg-config)))
+ (arguments
+ `(#:phases
+ (alist-cons-before
+ 'build 'patch-default-sounds-directory
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/sound-theme-spec.c"
+ (("@SOUND_THEME_DIRECTORY@")
+ (string-append
+ (assoc-ref inputs "sound-theme-freedesktop")
+ "/share"))))
+ %standard-phases)))
(home-page "http://0pointer.de/lennart/projects/libcanberra/";)
(synopsis
"Implementation of the XDG Sound Theme and Name Specifications")