diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2020-07-09 19:56:06 -0700 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:10 +0000 |
| commit | 45551603be6e0864613c53ca9674edb44f2acbd5 (patch) | |
| tree | ad56c3d9afbcabc9933443e528895d5230f05e9c /nixpkgs/pkgs/applications/networking/browsers | |
| parent | c5d1b45ac867257081f3271f8abdd2df8740e949 (diff) | |
| download | nixlib-45551603be6e0864613c53ca9674edb44f2acbd5.tar nixlib-45551603be6e0864613c53ca9674edb44f2acbd5.tar.gz nixlib-45551603be6e0864613c53ca9674edb44f2acbd5.tar.bz2 nixlib-45551603be6e0864613c53ca9674edb44f2acbd5.tar.lz nixlib-45551603be6e0864613c53ca9674edb44f2acbd5.tar.xz nixlib-45551603be6e0864613c53ca9674edb44f2acbd5.tar.zst nixlib-45551603be6e0864613c53ca9674edb44f2acbd5.zip | |
firefox{,-bin}: add 'mesa', for wayland/drm
(cherry picked from commit 8437596bebb1e7660b3a5783657ff6ac5e98afff)
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 27eba126de9e..4a9c3b90cabf 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -50,6 +50,7 @@ , gnupg , ffmpeg_3 , runtimeShell +, mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en-US" }: @@ -110,6 +111,7 @@ stdenv.mkDerivation { gtk2 gtk3 kerberos + mesa libX11 libXScrnSaver libXcomposite diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 7505e7e21967..8a79baf401f5 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,6 +10,7 @@ , udev , kerberos , libva +, mesa # firefox wants gbm for drm+dmabuf }: ## configurability of the wrapper itself @@ -65,7 +66,7 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva ] + libs = lib.optionals stdenv.isLinux [ udev libva mesa ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd |