diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-11-15 17:42:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 17:42:23 -0500 |
| commit | 1181aa74bcba03558eb18db93823a70305ddc56d (patch) | |
| tree | 717e8d4f858f52cdc29cbb7519f06037b26c58cd | |
| parent | eba04b34853b367e577138767ba1d0500922855b (diff) | |
| parent | d326246c9ab5525843e911307b250cd87ca1c027 (diff) | |
| download | nixlib-1181aa74bcba03558eb18db93823a70305ddc56d.tar nixlib-1181aa74bcba03558eb18db93823a70305ddc56d.tar.gz nixlib-1181aa74bcba03558eb18db93823a70305ddc56d.tar.bz2 nixlib-1181aa74bcba03558eb18db93823a70305ddc56d.tar.lz nixlib-1181aa74bcba03558eb18db93823a70305ddc56d.tar.xz nixlib-1181aa74bcba03558eb18db93823a70305ddc56d.tar.zst nixlib-1181aa74bcba03558eb18db93823a70305ddc56d.zip | |
Merge pull request #267700 from Atemu/fix/ffmpeg_4-full
ffmpeg_4-full: disable glslang
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index cd02c6bba15c..57235b24308d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -43,7 +43,7 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder |