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.
main
Martin Weinelt 2 years ago
parent 48eabf6838
commit 71d879b16b
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
  1. 3
      pkgs/applications/networking/browsers/firefox/common.nix
  2. 2
      pkgs/applications/networking/browsers/firefox/wrapper.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

@ -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

Loading…
Cancel
Save