From bb50b6eb9d1b860f45f873cf2e3af73f76adab05 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 11 Jul 2026 23:22:10 +0200 Subject: [PATCH] chromium: remove broken `pulseSupport = false;` override As far as I can tell, this override broke almost 10 years ago in 8391241e0c90c8e5ee90d86d6cc1c9146e575768. When trying to build the fixup commit that followed immediately after that (5f53fddf1ef784e2279bd4236c9f7566a038e89c) the build fails with the following error: ~~~ [11704/21910] CXX obj/media/media/vp9_compressed_header_parser.o [11705/> FAILED: obj/media/audio/audio/audio_manager_alsa.o g++ -MMD -MF obj/media/audio/audio/audio_manager_alsa.o.d [...] In file included from ../../media/audio/alsa/audio_manager_alsa.cc:28:0: ../../media/audio/pulse/audio_manager_pulse.h:8:30: fatal error: pulse/pulseaudio.h: No such file or directory compilation terminated. ninja: build stopped: subcommand failed. ~~~ And the same happens when trying to build chromium with `pulseSupport = false;` and picking random releases between 17.03 and now. I don't think there is a good reason to keep this, especially since no one bothered to test this in almost a decade. The chromium derivation is a mess, so let's run with this rather small win and remove this broken, mostly useless, obscure and untested permutation. --- .../networking/browsers/chromium/common.nix | 11 +++++++---- .../networking/browsers/chromium/default.nix | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index dd4df835a93c..de60b157e9bd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -91,7 +91,6 @@ cupsSupport ? true, cups ? null, proprietaryCodecs ? true, - pulseSupport ? false, libpulseaudio ? null, ungoogled ? false, ungoogled-chromium, @@ -394,7 +393,9 @@ let libgcrypt cups ] - ++ lib.optional pulseSupport libpulseaudio; + ++ [ + libpulseaudio + ]; buildInputs = [ ] @@ -455,7 +456,9 @@ let libgcrypt cups ] - ++ lib.optional pulseSupport libpulseaudio; + ++ [ + libpulseaudio + ]; patches = [ ./patches/cross-compile.patch @@ -968,7 +971,7 @@ let use_vaapi = false; use_v4l2_codec = true; } - // lib.optionalAttrs pulseSupport { + // { use_pulseaudio = true; link_pulseaudio = true; } diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3c058a84ed64..84f18a19a96c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -32,7 +32,6 @@ enableWideVine ? false, ungoogled ? false, # Whether to build chromium or ungoogled-chromium cupsSupport ? true, - pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, commandLineArgs ? "", pkgsBuildBuild, pkgs, @@ -76,7 +75,6 @@ let inherit proprietaryCodecs cupsSupport - pulseSupport ungoogled ; gnChromium = buildPackages.gn.override upstream-info.deps.gn;