diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-06-07 15:39:09 +0300 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-06-12 11:55:31 -0700 |
| commit | 01d4e2fe332420684803170597d1b88e9f826303 (patch) | |
| tree | 0a998e2bf5326595ec4a1fcffad7bfd963760dad /pkgs/development/compilers/openjdk/openjfx/11.nix | |
| parent | 8e1dcea3d575dfd4ecdee336e5b95c093f3017cb (diff) | |
| download | nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.gz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.bz2 nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.lz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.xz nixlib-01d4e2fe332420684803170597d1b88e9f826303.tar.zst nixlib-01d4e2fe332420684803170597d1b88e9f826303.zip | |
treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change.
Diffstat (limited to 'pkgs/development/compilers/openjdk/openjfx/11.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/11.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 7ba04ed50cc0..adb564f7cfee 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; dontUseCmakeConfigure = true; |