Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2019-12-05 17:57:35 +01:00
commit 9d5aa00906
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
284 changed files with 18112 additions and 13018 deletions

View file

@ -52,7 +52,8 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-web)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xiph))
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg))
(define-public libsndfile
(package
@ -150,7 +151,7 @@ rates.")
(define-public pulseaudio
(package
(name "pulseaudio")
(version "12.2")
(version "13.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -158,7 +159,7 @@ rates.")
name "-" version ".tar.xz"))
(sha256
(base32
"0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0"))
"0mw0ybrqj7hvf8lqs5gjzip464hfnixw453lr0mqzlng3b5266wn"))
(modules '((guix build utils)))
(snippet
;; Disable console-kit support by default since it's deprecated
@ -180,11 +181,6 @@ rates.")
(assoc-ref %outputs "out")
"/lib/udev/rules.d"))
#:phases (modify-phases %standard-phases
(add-before 'configure 'fix-alsa-include
(lambda _
(substitute* '("configure" "src/modules/alsa/alsa-ucm.h")
(("use-case\\.h") "alsa/use-case.h"))
#t))
(add-before 'check 'pre-check
(lambda _
;; 'tests/lock-autospawn-test.c' wants to create a file
@ -207,6 +203,13 @@ rates.")
("libltdl" ,libltdl)
("fftwf" ,fftwf)
("avahi" ,avahi)
;; For the optional X11 modules.
("libice" ,libice)
("libsm" ,libsm)
("libxcb" ,libxcb)
("libxtst" ,libxtst)
("eudev" ,eudev))) ;for the detection of hardware audio devices
(native-inputs
`(("check" ,check)