diff options
Diffstat (limited to 'modules/freya/packages/linux.scm')
| -rw-r--r-- | modules/freya/packages/linux.scm | 56 |
1 files changed, 43 insertions, 13 deletions
diff --git a/modules/freya/packages/linux.scm b/modules/freya/packages/linux.scm index b62f1fa..d61740a 100644 --- a/modules/freya/packages/linux.scm +++ b/modules/freya/packages/linux.scm @@ -1,18 +1,18 @@ (define-module (freya packages linux) - #:use-module (guix download) - #:use-module (guix packages) #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages linux) #:use-module (gnu packages python-xyz) - #:use-module (guix git-download) - #:use-module (guix utils) - #:use-module (freya packages networking)) + #:use-module (freya packages pulseaudio)) (define-public bluez-new (package (inherit bluez) - (version "5.72") + (version "5.77") (source (origin (method url-fetch) @@ -21,17 +21,44 @@ version ".tar.xz")) (sha256 (base32 - "0vjk4ihywzv8k07bxq7clqgi2afrw54nfp0gcnxw35m98nipz7a9")))) + "04h82lfhxh4vd1pyavk1nfrcxc0z5qg5jmsgal9mh22a3pf2y0sx")))) (arguments (list #:configure-flags - #~(list "--sysconfdir=/etc" + #~(list (string-append "--prefix=" #$output) + "--sysconfdir=/etc" "--localstatedir=/var" "--enable-library" "--disable-manpages" "--disable-systemd" "--enable-hid2hci" (string-append "--with-dbusconfdir=" #$output "/etc") - (string-append "--with-udevdir=" #$output "/lib/udev")))))) + (string-append "--with-udevdir=" #$output "/lib/udev")) + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("install-confDATA:") "install-IGNORED:") + (("install-confDATA") "") + (("bluetoothd-fix-permissions:") "install-IGNORED2:") + (("bluetoothd-fix-permissions") ""))))) + )) + )) + + +(define-public alsa-lib-new + (package + (inherit alsa-lib) + (name "alsa-lib") + (version "1.2.12") + (source (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-" + version ".tar.bz2")) + (sha256 + (base32 + "1lnh38wii8mnwp3n4hnqa718rgi52rq6ix1llsjrs9r7hs8css28")))))) (define-public pipewire-new @@ -49,10 +76,13 @@ (base32 "0cvbyklzqcdr9zj7k7psb24xp8cxb9fdksrd74r68zvnbbix1qlx")))) (inputs - (modify-inputs - (package-inputs pipewire) - (delete "alsa-lib") - (prepend alsa-lib-new))))) + (modify-inputs (package-inputs pipewire) + (delete "alsa-lib") + (delete "bluez") + (delete "pulseaudio") + (prepend alsa-lib-new) + (prepend bluez-new) + (prepend pulseaudio-new))))) (define-public wireplumber-new |