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

qt55: use python2

This commit is contained in:
Frederik Rietdijk 2016-10-18 23:00:04 +02:00
parent 284f22d19e
commit 8fcccec543
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View File

@ -8,7 +8,7 @@
, zlib, libjpeg, libpng, libtiff, sqlite, icu , zlib, libjpeg, libpng, libtiff, sqlite, icu
, coreutils, bison, flex, gdb, gperf, lndir , coreutils, bison, flex, gdb, gperf, lndir
, patchelf, perl, pkgconfig, python , patchelf, perl, pkgconfig, python2
# optional dependencies # optional dependencies
, cups ? null , cups ? null
@ -213,7 +213,7 @@ stdenv.mkDerivation {
# FIXME: move to the main list on rebuild. # FIXME: move to the main list on rebuild.
++ [gnome_vfs.out libgnomeui.out gtk2 GConf]; ++ [gnome_vfs.out libgnomeui.out gtk2 GConf];
nativeBuildInputs = [ lndir patchelf perl pkgconfig python ]; nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ];
# freetype-2.5.4 changed signedness of some struct fields # freetype-2.5.4 changed signedness of some struct fields
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";

4
pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
View File

@ -1,8 +1,8 @@
{ qtSubmodule, lib, copyPathsToStore, python, qtbase, qtsvg, qtxmlpatterns }: { qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
qtSubmodule { qtSubmodule {
name = "qtdeclarative"; name = "qtdeclarative";
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
qtInputs = [ qtbase qtsvg qtxmlpatterns ]; qtInputs = [ qtbase qtsvg qtxmlpatterns ];
nativeBuildInputs = [ python ]; nativeBuildInputs = [ python2 ];
} }

4
pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
View File

@ -1,7 +1,7 @@
{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
, sqlite, systemd, glib, gst_all_1 , sqlite, systemd, glib, gst_all_1
, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
, substituteAll , substituteAll
, flashplayerFix ? false , flashplayerFix ? false
}: }:
@ -13,7 +13,7 @@ qtSubmodule {
qtInputs = [ qtdeclarative qtlocation qtsensors ]; qtInputs = [ qtdeclarative qtlocation qtsensors ];
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
nativeBuildInputs = [ nativeBuildInputs = [
bison2 flex gdb gperf perl pkgconfig python ruby bison2 flex gdb gperf perl pkgconfig python2 ruby
]; ];
patches = patches =
let dlopen-webkit-nsplugin = substituteAll { let dlopen-webkit-nsplugin = substituteAll {