pyrox.dev
lol
pulseaudio: More refactoring to bring libpulse in line with pulse libraries
+8
-9
+8
-9
pkgs/servers/pulseaudio/default.nix
+8
-9
pkgs/servers/pulseaudio/default.nix
···
6
6
, alsaLib ? null, esound ? null, glib ? null, gtk3 ? null, gconf ? null
7
7
, avahi ? null, libjack2 ? null, libasyncns ? null, lirc ? null, dbus ? null
8
8
, sbc ? null, bluez5 ? null, udev ? null, openssl ? null, fftw ? null
9
-
, speex ? null, systemd ? null, webrtc-audio-processing ? null
9
+
, speexdsp ? null, systemd ? null, webrtc-audio-processing ? null
10
10
11
11
# Database selection
12
12
, tdb ? null, gdbm ? null
···
29
29
30
30
hasXlibs = xlibs != null;
31
31
32
-
optLibcap = if libOnly then null else shouldUsePkg libcap;
32
+
optLibcap = shouldUsePkg libcap;
33
33
hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD
34
34
35
35
optOss = if libOnly then null else shouldUsePkg oss;
···
51
51
else shouldUsePkg bluez5;
52
52
optUdev = if libOnly then null else shouldUsePkg udev;
53
53
optOpenssl = if libOnly then null else shouldUsePkg openssl;
54
-
optFftw = if libOnly then null else shouldUsePkg fftw;
55
-
optSpeex = if libOnly then null else shouldUsePkg speex;
54
+
optFftw = shouldUsePkg fftw;
55
+
optSpeexdsp = shouldUsePkg speexdsp;
56
56
optSystemd = shouldUsePkg systemd;
57
57
optWebrtc-audio-processing = if libOnly then null else shouldUsePkg webrtc-audio-processing;
58
58
hasWebrtc = if libOnly then null else optWebrtc-audio-processing != null;
···
83
83
84
84
optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
85
85
optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
86
-
optOpenssl optFftw optSpeex optSystemd optWebrtc-audio-processing
86
+
optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing
87
87
] ++ stdenv.lib.optionals hasXlibs (with xlibs; [
88
88
libX11 libxcb libICE libSM libXtst xextproto libXi
89
89
]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ];
···
105
105
'';
106
106
107
107
configureFlags = [
108
-
"--localstatedir=/var"
109
-
"--sysconfdir=/etc"
110
-
108
+
(mkOther "localstatedir" "/var")
109
+
(mkOther "sysconfdir" "/etc")
111
110
(mkEnable false "atomic-arm-memory-barrier" null) # TODO: Enable on armv8
112
111
(mkEnable false "neon-opt" null) # TODO: Enable on armv8
113
112
(mkEnable hasXlibs "x11" null)
···
140
139
(mkEnable true "ipv6" null)
141
140
(mkEnable (optOpenssl != null) "openssl" null)
142
141
(mkWith (optFftw != null) "fftw" null)
143
-
(mkWith (optSpeex != null) "speex" null)
142
+
(mkWith (optSpeexdsp != null) "speex" null)
144
143
(mkEnable false "xen" null)
145
144
(mkEnable false "gcov" null)
146
145
(mkEnable (optSystemd != null) "systemd-daemon" null)