diff options
author | adisbladis <adisbladis@gmail.com> | 2020-08-26 15:22:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-26 15:22:59 +0200 |
commit | 5f464fcd1fc018976862ba93061906a8748ba300 (patch) | |
tree | a805eda09a4be4b9b4a66d15146e9f79ca89a8e0 /pkgs/applications/networking/browsers | |
parent | 06abd5c4f146635ad1b048f43322faeb007b730d (diff) | |
parent | 8bf91014a7170efd512fd73759333a41b25587a4 (diff) |
Merge pull request #95113 from samuelgrf/update/firefox-bin-ffmpeg
firefox-bin: ffmpeg_3 -> ffmpeg
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6f5b18bd56cb3..d86b9d6f98709 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -45,7 +45,7 @@ , gnused , gnugrep , gnupg -, ffmpeg_3 +, ffmpeg , runtimeShell , mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en-US" @@ -130,7 +130,7 @@ stdenv.mkDerivation { libpulseaudio (lib.getDev libpulseaudio) systemd - ffmpeg_3 + ffmpeg ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; |