From fa8551634e0018c8b6b253152da6e03935c1eb49 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Mar 2021 02:49:10 +0100 Subject: [PATCH] openjfx15: python2 -> python3, ffmpeg_3 -> ffmpeg --- pkgs/development/compilers/openjdk/openjfx/15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index f9059ae2fc43..655b29f6535d 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;