mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-18 19:54:15 +02:00
Merge pull request #114940 from helsinki-systems/openjfx15
openjfx15: python2 -> python3, ffmpeg_3 -> ffmpeg
This commit is contained in:
commit
5b46c7c4fe
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
|
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
|
||||||
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
|
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
|
||||||
, ffmpeg_3, python, ruby }:
|
, ffmpeg, python3, ruby }:
|
||||||
|
|
||||||
let
|
let
|
||||||
major = "15";
|
major = "15";
|
||||||
|
@ -21,8 +21,8 @@ let
|
||||||
sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
|
sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
|
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
|
||||||
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
|
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
|
||||||
|
|
||||||
dontUseCmakeConfigure = true;
|
dontUseCmakeConfigure = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue