diff options
-rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/5.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/6.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 905e93de7a7..6bd9a8b8f1a 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { version = "4.4.4"; sha256 = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; extraPatches = [ diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix index dcfe033f040..a3ff054f1e6 100644 --- a/pkgs/development/libraries/ffmpeg/5.nix +++ b/pkgs/development/libraries/ffmpeg/5.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { version = "5.1.3"; sha256 = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; extraPatches = [ diff --git a/pkgs/development/libraries/ffmpeg/6.nix b/pkgs/development/libraries/ffmpeg/6.nix index cf29526fbcb..37bdf5b060f 100644 --- a/pkgs/development/libraries/ffmpeg/6.nix +++ b/pkgs/development/libraries/ffmpeg/6.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { version = "6.0"; sha256 = "sha256-RVbgsafIbeUUNXmUbDQ03ZN42oaUo0njqROo7KOQgv0="; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index cb0225fd3c4..6bde5aa776b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256, extraPatches ? [], knownVulnerabilities ? [] }: +{ version, sha256, extraPatches ? [] }: { lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm @@ -33,7 +33,6 @@ , withBzlib ? withHeadlessDeps , withCaca ? withFullDeps # Textual display (ASCII art) , withCelt ? withFullDeps # CELT decoder -, withCrystalhd ? withFullDeps , withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch && !hostPlatform.isRiscV)) , withCudaLLVM ? withFullDeps , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) @@ -49,7 +48,6 @@ , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder , withIconv ? withHeadlessDeps -, withIlbc ? withFullDeps , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio , withLadspa ? withFullDeps # LADSPA audio filtering , withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library |