diff options
author | ajs124 <git@ajs124.de> | 2021-03-03 02:49:10 +0100 |
---|---|---|
committer | ajs124 <git@ajs124.de> | 2021-03-03 02:50:48 +0100 |
commit | fa8551634e0018c8b6b253152da6e03935c1eb49 (patch) | |
tree | 44d33176fd6e30d8eb1e286fec70059f583a02c8 /pkgs/development/compilers/openjdk/openjfx/15.nix | |
parent | 544139a32bd150cdca8ca0bfa35e8fb9c8aada19 (diff) | |
download | nixpkgs-fa8551634e0018c8b6b253152da6e03935c1eb49.tar nixpkgs-fa8551634e0018c8b6b253152da6e03935c1eb49.tar.gz nixpkgs-fa8551634e0018c8b6b253152da6e03935c1eb49.tar.bz2 nixpkgs-fa8551634e0018c8b6b253152da6e03935c1eb49.tar.lz nixpkgs-fa8551634e0018c8b6b253152da6e03935c1eb49.tar.xz nixpkgs-fa8551634e0018c8b6b253152da6e03935c1eb49.tar.zst nixpkgs-fa8551634e0018c8b6b253152da6e03935c1eb49.zip |
openjfx15: python2 -> python3, ffmpeg_3 -> ffmpeg
Diffstat (limited to 'pkgs/development/compilers/openjdk/openjfx/15.nix')
-rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/15.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index f9059ae2fc4..655b29f6535 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib -, ffmpeg_3, python, ruby }: +, ffmpeg, python3, ruby }: let major = "15"; @@ -21,8 +21,8 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; |