cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

firefox: pass pciutils via wrapper instead of patching it

Browse source
This commit is contained in:
Martin Weinelt 2022-03-21 21:58:03 +01:00
parent 51e5f33899
commit 178d447610
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -19,7 +19,7 @@
, libffi , libffi
, libvpx , libvpx
, libwebp , libwebp
, icu, libpng, glib, pciutils , icu, libpng, glib
, autoconf, which, gnused, rustPackages, rustPlatform , autoconf, which, gnused, rustPackages, rustPlatform
, rust-cbindgen, nodejs, nasm, fetchpatch , rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4 , gnum4
@ -135,9 +135,6 @@ buildStdenv.mkDerivation ({
postPatch = '' postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu rm -rf obj-x86_64-pc-linux-gnu
substituteInPlace toolkit/xre/glxtest.cpp \
--replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so'
patchShebangs mach patchShebangs mach
'' + extraPostPatch; '' + extraPostPatch;

3
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -12,6 +12,7 @@
, libva , libva
, mesa # firefox wants gbm for drm+dmabuf , mesa # firefox wants gbm for drm+dmabuf
, cups , cups
, pciutils
}: }:
## configurability of the wrapper itself ## configurability of the wrapper itself
@ -66,7 +67,7 @@ let
++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
++ extraNativeMessagingHosts ++ 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 pipewireSupport pipewire
++ lib.optional ffmpegSupport ffmpeg ++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport libkrb5 ++ lib.optional gssSupport libkrb5