swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-18 19:54:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114940 from helsinki-systems/openjfx15

Browse source 
openjfx15: python2 -> python3, ffmpeg_3 -> ffmpeg
This commit is contained in:
Sandro 2021-03-03 13:00:08 +01:00 committed by GitHub
parent f209432103 fa8551634e
commit 5b46c7c4fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/openjdk/openjfx/15.nix
View file

@ -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;