diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-21 21:58:03 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-03-23 17:03:42 +0100 |
| commit | 178d447610648c0efcd9b547b7d41c2ecdf3357c (patch) | |
| tree | 6835cb1bfd4ffa51f4132fed7c6f195116956a1e | |
| parent | firefox: fix system libffi usage (diff) | |
| download | nixpkgs-178d447610648c0efcd9b547b7d41c2ecdf3357c.tar.gz | |
firefox: pass pciutils via wrapper instead of patching it
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index f8a2215ebe78..be5eb550a94c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -19,7 +19,7 @@ , libffi , libvpx , libwebp -, icu, libpng, glib, pciutils +, icu, libpng, glib , autoconf, which, gnused, rustPackages, rustPlatform , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -135,9 +135,6 @@ buildStdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu - substituteInPlace toolkit/xre/glxtest.cpp \ - --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' - patchShebangs mach '' + extraPostPatch; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e87eb4b94df6..d5055f04ed82 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -12,6 +12,7 @@ , libva , mesa # firefox wants gbm for drm+dmabuf , cups +, pciutils }: ## configurability of the wrapper itself @@ -66,7 +67,7 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups ] + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 |