diff options
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.7')
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 81d0e446f2a..16cc09f9c03 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -2,7 +2,7 @@ stdenv, lib, copyPathsToStore, src, version, - coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python, + coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, ruby, dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, @@ -189,7 +189,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python ]; + [ bison flex gperf lndir patchelf perl pkgconfig python2 ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix index 328d8aee72b..9b6a6c46176 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix @@ -1,8 +1,8 @@ -{ qtSubmodule, lib, copyPathsToStore, python, qtbase, qtsvg, qtxmlpatterns }: +{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: qtSubmodule { name = "qtdeclarative"; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); qtInputs = [ qtbase qtsvg qtxmlpatterns ]; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python2 ]; } diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix index 683bb031e95..915a6bcae8a 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix @@ -1,7 +1,7 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 -, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby +, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby , substituteAll , flashplayerFix ? false }: @@ -13,7 +13,7 @@ qtSubmodule { qtInputs = [ qtdeclarative qtlocation qtsensors ]; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python ruby + bison2 flex gdb gperf perl pkgconfig python2 ruby ]; patches = let dlopen-webkit-nsplugin = substituteAll { |