forked from mirrors/nixpkgs
firefox: pass pciutils via wrapper instead of patching it
This commit is contained in:
parent
51e5f33899
commit
178d447610
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue