diff options
author | Ivan Kozik <ivan@ludios.org> | 2022-09-24 15:44:05 +0000 |
---|---|---|
committer | Ivan Kozik <ivan@ludios.org> | 2022-09-24 17:20:30 +0000 |
commit | 53256fcdb5a0dfb6e3c27eb7d73bf2527342a625 (patch) | |
tree | bcd1183f0398e1630940fcd8698fa189b046e727 | |
parent | f06304c02d5de50533f65f1e22480f12f2309569 (diff) | |
download | nixpkgs-53256fcdb5a0dfb6e3c27eb7d73bf2527342a625.tar nixpkgs-53256fcdb5a0dfb6e3c27eb7d73bf2527342a625.tar.gz nixpkgs-53256fcdb5a0dfb6e3c27eb7d73bf2527342a625.tar.bz2 nixpkgs-53256fcdb5a0dfb6e3c27eb7d73bf2527342a625.tar.lz nixpkgs-53256fcdb5a0dfb6e3c27eb7d73bf2527342a625.tar.xz nixpkgs-53256fcdb5a0dfb6e3c27eb7d73bf2527342a625.tar.zst nixpkgs-53256fcdb5a0dfb6e3c27eb7d73bf2527342a625.zip |
openjfx17: use ffmpeg_4
openjfx17's plugins/av/mpegtsdemuxer.c expects ffmpeg 4 and does not build with ffmpeg 5.1.1. This change does not result in any rebuilds because nixpkgs `ffmpeg` still points to `ffmpeg_4`.
-rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/17.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 12bac4c4d9d..734f4d079ef 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg, python3, ruby, icu68 }: +, ffmpeg_4, python3, ruby, icu68 }: let major = "17"; @@ -21,7 +21,7 @@ let sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; |