opencv4: use ffmpeg-headless (#524863)
This commit is contained in:
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
(opencv4.override { inherit ffmpeg; })
|
||||
(opencv4.override { ffmpeg-headless = ffmpeg; })
|
||||
ffmpeg
|
||||
fftw
|
||||
frei0r
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
enableVtk ? false,
|
||||
vtk,
|
||||
enableFfmpeg ? true,
|
||||
ffmpeg,
|
||||
ffmpeg-headless,
|
||||
enableGStreamer ? true,
|
||||
elfutils,
|
||||
gst_all_1,
|
||||
@@ -373,7 +373,7 @@ effectiveStdenv.mkDerivation {
|
||||
openjpeg
|
||||
]
|
||||
++ optionals enableFfmpeg [
|
||||
ffmpeg
|
||||
ffmpeg-headless
|
||||
]
|
||||
++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
|
||||
elfutils
|
||||
|
||||
Reference in New Issue
Block a user