Merge pull request #75916 from grahamc/python3/qtbase

qt5.qtbase: python2 -> python3
This commit is contained in:
Graham Christensen
2019-12-18 22:59:09 -05:00
committed by GitHub

View File

@@ -2,7 +2,7 @@
stdenv, lib,
src, patches, version, qtCompatVersion,
coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python2,
coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3,
which,
# darwin support
darwin, libiconv,
@@ -75,7 +75,8 @@ stdenv.mkDerivation {
);
buildInputs =
lib.optionals (!stdenv.isDarwin)
[ python3 ]
++ lib.optionals (!stdenv.isDarwin)
(
[ libinput ]
++ lib.optional withGtk3 gtk3
@@ -86,7 +87,7 @@ stdenv.mkDerivation {
++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs =
[ bison flex gperf lndir perl pkgconfig python2 which ];
[ bison flex gperf lndir perl pkgconfig which ];
propagatedNativeBuildInputs = [ lndir ];