JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #75916 from grahamc/python3/qtbase

Browse Source 
qt5.qtbase: python2 -> python3
This commit is contained in:
Graham Christensen 2019-12-18 22:59:09 -05:00 committed by GitHub
commit 5782c395d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/modules/qtbase.nix
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 ];