1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00

Merge pull request #95113 from samuelgrf/update/firefox-bin-ffmpeg

firefox-bin: ffmpeg_3 -> ffmpeg
This commit is contained in:
adisbladis 2020-08-26 15:22:59 +02:00 committed by GitHub
commit 5f464fcd1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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
];