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/oraclejdk/jdk-linux-base.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/oraclejdk/jdk-linux-base.nix')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 092af49a9f8b..78fff4a59fba 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -19,7 +19,7 @@ , glib , libxml2 , libav_0_8 -, ffmpeg +, ffmpeg_3 , libxslt , libGL , freetype @@ -171,7 +171,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; |