treewide: drop references to config.pulseaudio (#572569)

2026-10-30 16:10:36 +00:00 · 2026-10-14 15:12:21 +00:00
parent 474f7d8c0b 7ef17f5fc2
commit b9d7172aac
33 changed files with 38 additions and 64 deletions
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -136,7 +136,7 @@ let
          alsa-lib
          zlib
        ]
-        ++ lib.optional (config.pulseaudio or (!isDarwin)) libpulseaudio
+        ++ lib.optional (!isDarwin) libpulseaudio
        ++ lib.optional withALSA alsa-lib
        ++ lib.optional withSndio sndio
        ++ lib.optional withJACK libjack2
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -37,7 +37,7 @@
  python3,
  alsaSupport ? stdenv.hostPlatform.isLinux,
  alsa-lib,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  browserSupport ? true,
  cef-binary,
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -55,7 +55,7 @@
  python3,
  extensionPack ? null,
  fakeroot,
-  pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  enableHardening ? false,
  headless ? false,
--- a/pkgs/by-name/ae/aegisub/package.nix
+++ b/pkgs/by-name/ae/aegisub/package.nix
@@ -3,7 +3,6 @@
  alsa-lib,
  boost,
  meson,
-  config,
  expat,
  fetchFromGitHub,
  ffmpeg,
@@ -35,7 +34,7 @@
  alsaSupport ? stdenv.hostPlatform.isLinux,
  openalSupport ? true,
  portaudioSupport ? true,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  spellcheckSupport ? true,
  useBundledLuaJIT ? false,
 }:
--- a/pkgs/by-name/bl/blueman/package.nix
+++ b/pkgs/by-name/bl/blueman/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  stdenv,
  lib,
  fetchurl,
@@ -18,7 +17,7 @@
  wrapGAppsHook3,
  gobject-introspection,
  networkmanager,
-  withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  withPulseAudio ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  procps,
 }:
--- a/pkgs/by-name/cm/cmus/package.nix
+++ b/pkgs/by-name/cm/cmus/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  fetchFromGitHub,
@@ -18,7 +17,7 @@
  libsamplerate ? null,
  ossSupport ? false,
  alsa-oss ? null,
-  pulseaudioSupport ? config.pulseaudio or false,
+  pulseaudioSupport ? false,
  libpulseaudio ? null,
  sndioSupport ? false,
  sndio ? null,
--- a/pkgs/by-name/de/deadbeef/package.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -1,6 +1,5 @@
 {
  lib,
-  config,
  clangStdenv,
  fetchFromGitHub,
  autoreconfHook,
@@ -46,7 +45,7 @@
  # output plugins
  alsaSupport ? true,
  alsa-lib,
-  pulseSupport ? config.pulseaudio or true,
+  pulseSupport ? true,
  libpulseaudio,
  pipewireSupport ? true,
  pipewire,
--- a/pkgs/by-name/gu/guvcview/package.nix
+++ b/pkgs/by-name/gu/guvcview/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  fetchurl,
@@ -16,7 +15,7 @@
  gsl,
  libpng,
  sfml_2,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  useQt ? false,
  libsForQt5,
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  alsa-lib,
@@ -24,7 +23,7 @@

  withALSA ? stdenv.hostPlatform.isLinux,
  withJACK ? false,
-  withPulseaudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  withPulseaudio ? stdenv.hostPlatform.isLinux,
 }:

 let
--- a/pkgs/by-name/li/libao/package.nix
+++ b/pkgs/by-name/li/libao/package.nix
@@ -8,8 +8,7 @@
  libpulseaudio,
  alsa-lib,
  libcap,
-  config,
-  usePulseAudio ? config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio),
+  usePulseAudio ? lib.meta.availableOn stdenv.hostPlatform libpulseaudio,
 }:

 stdenv.mkDerivation (finalAttrs: {
--- a/pkgs/by-name/li/libmatemixer/package.nix
+++ b/pkgs/by-name/li/libmatemixer/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  fetchurl,
@@ -9,7 +8,7 @@
  alsaSupport ? stdenv.hostPlatform.isLinux,
  alsa-lib,
  udev,
-  pulseaudioSupport ? config.pulseaudio or true,
+  pulseaudioSupport ? true,
  libpulseaudio,
  ossSupport ? false,
  gitUpdater,
--- a/pkgs/by-name/li/libopenmpt/package.nix
+++ b/pkgs/by-name/li/libopenmpt/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  fetchurl,
@@ -11,7 +10,7 @@
  portaudio,
  libsndfile,
  flac,
-  usePulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  usePulseAudio ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
 }:

--- a/pkgs/by-name/li/librespot/package.nix
+++ b/pkgs/by-name/li/librespot/package.nix
@@ -11,9 +11,8 @@
  alsa-plugins,
  withPortAudio ? stdenv.hostPlatform.isDarwin,
  portaudio,
-  withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  withPulseAudio ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
-  config,
  withRodio ? true,
  withAvahi ? false,
  withMDNS ? true,
--- a/pkgs/by-name/ma/mate-settings-daemon/package.nix
+++ b/pkgs/by-name/ma/mate-settings-daemon/package.nix
@@ -15,7 +15,6 @@
  dconf,
  gtk3,
  mate-desktop,
-  pulseaudioSupport ? stdenv.config.pulseaudio or true,
  libpulseaudio,
  wrapGAppsHook3,
  gitUpdater,
@@ -53,10 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
    gtk3
    dconf
    mate-desktop
-  ]
-  ++ lib.optional pulseaudioSupport libpulseaudio;
+    libpulseaudio
+  ];

-  configureFlags = lib.optional pulseaudioSupport "--enable-pulse";
+  configureFlags = [ "--enable-pulse" ];

  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

--- a/pkgs/by-name/mi/mimic/package.nix
+++ b/pkgs/by-name/mi/mimic/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  autoreconfHook,
@@ -12,8 +11,6 @@
  libtool,
  icu,
  pcre2,
-  pulseaudioSupport ? config.pulseaudio or false,
-  libpulseaudio,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -49,8 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
    libtool
    icu
    pcre2
-  ]
-  ++ lib.optional pulseaudioSupport libpulseaudio;
+  ];

  env.NIX_CFLAGS_COMPILE = toString [
    # Needed with GCC 12
--- a/pkgs/by-name/mp/mplayer/package.nix
+++ b/pkgs/by-name/mp/mplayer/package.nix
@@ -53,7 +53,7 @@
  x264,
  jackaudioSupport ? config.mplayer.jackaudioSupport or false,
  libjack2,
-  pulseSupport ? config.pulseaudio or false,
+  pulseSupport ? config.mplayer.pulseSupport or false,
  libpulseaudio,
  bs2bSupport ? config.mplayer.bs2bSupport or false,
  libbs2b,
--- a/pkgs/by-name/mp/mpv-unwrapped/package.nix
+++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix
@@ -5,7 +5,6 @@
  alsa-lib,
  bash,
  buildPackages,
-  config,
  docutils,
  fetchFromGitHub,
  ffmpeg,
@@ -75,7 +74,7 @@
  javascriptSupport ? true,
  openalSupport ? true,
  pipewireSupport ? !stdenv.hostPlatform.isDarwin,
-  pulseSupport ? config.pulseaudio or (!stdenv.hostPlatform.isDarwin),
+  pulseSupport ? !stdenv.hostPlatform.isDarwin,
  rubberbandSupport ? true,
  sdl2Support ? false,
  sixelSupport ? false,
--- a/pkgs/by-name/nc/ncspot/package.nix
+++ b/pkgs/by-name/nc/ncspot/package.nix
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  alsa-lib,
-  config,
  dbus,
  fetchFromGitHub,
  libpulseaudio,
@@ -24,7 +23,7 @@
  withNotify ? true,
  withPancurses ? false,
  withPortAudio ? stdenv.hostPlatform.isDarwin,
-  withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  withPulseAudio ? stdenv.hostPlatform.isLinux,
  withRodio ? false,
  withShareSelection ? false,
  withTermion ? false,
--- a/pkgs/by-name/ow/owntone/package.nix
+++ b/pkgs/by-name/ow/owntone/package.nix
@@ -8,7 +8,7 @@
  nix-update-script,

  chromecastSupport ? config.chromecast or stdenv.hostPlatform.isLinux,
-  pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseSupport ? stdenv.hostPlatform.isLinux,

  avahi,
  curl,
--- a/pkgs/by-name/pc/pcaudiolib/package.nix
+++ b/pkgs/by-name/pc/pcaudiolib/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  fetchFromGitHub,
@@ -11,7 +10,7 @@
  pkg-config,
  portaudio,
  which,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
 }:

 stdenv.mkDerivation (finalAttrs: {
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  cairo,
  cmake,
  fetchFromGitHub,
@@ -35,7 +34,7 @@
  alsaSupport ? true,
  githubSupport ? false,
  mpdSupport ? false,
-  pulseSupport ? config.pulseaudio or false,
+  pulseSupport ? false,
  iwSupport ? false,
  nlSupport ? true,
  i3Support ? false,
--- a/pkgs/by-name/re/reaper/package.nix
+++ b/pkgs/by-name/re/reaper/package.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  fetchurl,
@@ -22,7 +21,7 @@

  jackSupport ? stdenv.hostPlatform.isLinux,
  jackLibrary ? libjack2, # Another option is "pipewire.jack"
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
 }:

--- a/pkgs/by-name/rt/rtaudio_5/package.nix
+++ b/pkgs/by-name/rt/rtaudio_5/package.nix
@@ -1,13 +1,12 @@
 {
  stdenv,
  lib,
-  config,
  fetchFromGitHub,
  cmake,
  pkg-config,
  alsaSupport ? stdenv.hostPlatform.isLinux,
  alsa-lib,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  jackSupport ? true,
  libjack2,
--- a/pkgs/by-name/rt/rtaudio_6/package.nix
+++ b/pkgs/by-name/rt/rtaudio_6/package.nix
@@ -1,14 +1,13 @@
 {
  stdenv,
  lib,
-  config,
  fetchFromGitHub,
  testers,
  cmake,
  pkg-config,
  alsaSupport ? stdenv.hostPlatform.isLinux,
  alsa-lib,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  jackSupport ? true,
  libjack2,
--- a/pkgs/by-name/sc/scream/package.nix
+++ b/pkgs/by-name/sc/scream/package.nix
@@ -1,13 +1,12 @@
 {
  stdenv,
  lib,
-  config,
  fetchFromGitHub,
  cmake,
  pkg-config,
  alsaSupport ? stdenv.hostPlatform.isLinux,
  alsa-lib,
-  pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  jackSupport ? false,
  libjack2,
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  config,
  alsa-lib,
  cmake,
  dbus,
@@ -54,8 +53,7 @@
  libusbSupport ? stdenv.hostPlatform.isLinux,
  openglSupport ? lib.meta.availableOn stdenv.hostPlatform libGL,
  pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
-  pulseaudioSupport ?
-    config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
  sndioSupport ? false,
  traySupport ? true,
  vulkanSupport ? true,
--- a/pkgs/by-name/sn/snapcast/package.nix
+++ b/pkgs/by-name/sn/snapcast/package.nix
@@ -16,8 +16,7 @@
  soxr,
  aixlog,
  popl,
-  config,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  pipewireSupport ? stdenv.hostPlatform.isLinux,
  libpulseaudio,
  pipewire,
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  config,
  nix-update-script,
  buildDotnetModule,
  dotnetCorePackages,
@@ -32,7 +31,7 @@
  alsaSupport ? stdenv.hostPlatform.isLinux,
  jackSupport ? stdenv.hostPlatform.isLinux,
  pipewireSupport ? stdenv.hostPlatform.isLinux,
-  pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  pulseaudioSupport ? stdenv.hostPlatform.isLinux,
  soundfont-fluid,

  # Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used.
--- a/pkgs/by-name/sp/spotifyd/package.nix
+++ b/pkgs/by-name/sp/spotifyd/package.nix
@@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  config,
  alsa-lib,
  cmake,
  dbus,
@@ -18,7 +17,7 @@
  withJack ? stdenv.hostPlatform.isLinux,
  withMpris ? stdenv.hostPlatform.isLinux,
  withPortAudio ? stdenv.hostPlatform.isDarwin,
-  withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
+  withPulseAudio ? stdenv.hostPlatform.isLinux,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,5 +1,4 @@
 {
-  config,
  lib,
  stdenv,
  fetchFromGitHub,
@@ -57,7 +56,7 @@
  wirelesstools ? null,
  nvidiaSupport ? false,
  libXNVCtrl ? null,
-  pulseSupport ? config.pulseaudio or false,
+  pulseSupport ? false,
  libpulseaudio ? null,

  curlSupport ? true,
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8823,7 +8823,7 @@ with pkgs;
  murmur =
    (callPackages ../applications/networking/mumble {
      avahi = avahi-compat;
-      pulseSupport = config.pulseaudio or false;
+      pulseSupport = false;
      iceSupport = config.murmur.iceSupport or true;
    }).murmur;

--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -538,7 +538,10 @@ in
          config.problems.matchers = [ { kind = "maintainerless"; handler = "warn"; } ];

        See this page for more details: https://nixos.org/manual/nixpkgs/unstable#sec-problems
-      '';
+      ''
+      ++ lib.optionals (config ? pulseaudio) [
+        "`config.pulseaudio` is deprecated, and no longer has an effect. Please remove it from your Nixpkgs configuration."
+      ];

    assertions =
      # Collect the assertions from the problems.matchers.* submodules, propagate them into here
--- a/pkgs/top-level/wine-packages.nix
+++ b/pkgs/top-level/wine-packages.nix
@@ -34,7 +34,7 @@ lib.makeExtensible (
      cairoSupport = stdenv.hostPlatform.isLinux;
      cursesSupport = true;
      saneSupport = stdenv.hostPlatform.isLinux;
-      pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
+      pulseaudioSupport = stdenv.hostPlatform.isLinux;
      udevSupport = stdenv.hostPlatform.isLinux;
      xineramaSupport = stdenv.hostPlatform.isLinux;
      sdlSupport = true;