From 71d879b16b5c7b21a1233896eab7ecb9fef5eefc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Mar 2022 14:28:16 +0100 Subject: [PATCH] firefox: drop pipewire from build inputs Firefox does not support passing pipewire as a system library and instead relies on a vendored copy it ships. We keep the flag because it is tied into the wrapper, because we still need to have access to its libraries at runtime. --- pkgs/applications/networking/browsers/firefox/common.nix | 3 +-- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c49d2f2a3177..0500f6e8d4b9 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -37,7 +37,7 @@ , waylandSupport ? true, libxkbcommon, libdrm , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 -, pipewireSupport ? waylandSupport && webrtcSupport, pipewire +, pipewireSupport ? waylandSupport && webrtcSupport # Jemalloc could reduce memory consumption. , jemallocSupport ? true, jemalloc @@ -187,7 +187,6 @@ buildStdenv.mkDerivation ({ ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] - ++ lib.optional pipewireSupport pipewire ++ lib.optional jemallocSupport jemalloc ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 4713320e0685..7cc570eb0fb6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -67,7 +67,7 @@ let ++ extraNativeMessagingHosts ); libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups ] - ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire + ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd