From ef96a4ad7854e2f1f8d4b14c4718302503d16586 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 18 Dec 2019 20:59:21 -0500 Subject: [PATCH] qt5.qtbase: python2 -> python3 The only python reference in qtbase's dev output is a python script which imports print from __future__ (mkspecs/features/uikit/devices.py). It's not clear whether it depends on python or it just provides a python script. But I believe it's still good to have in buildInputs so it has a proper shebang. Co-authored-by: worldofpeace --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 3dbdb2a9770..c7cb6d509dc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -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 ];