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

pyqt5: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 18:48:09 -06:00
parent 68ff859bf0
commit 05dbd07cd1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, python, pkgconfig, qt5, sip, pythonDBus, lndir, makeWrapper }: { stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus
, lndir, makeWrapper }:
let let
version = "5.4.2"; version = "5.4.2";
@ -20,7 +21,7 @@ in stdenv.mkDerivation {
buildInputs = [ buildInputs = [
python pkgconfig makeWrapper lndir python pkgconfig makeWrapper lndir
qt5.base qt5.svg qt5.webkit qtbase qtsvg qtwebkit
]; ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip ];

2
pkgs/top-level/python-packages.nix
View File

@ -166,7 +166,7 @@ in modules // {
pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
sip = self.sip_4_16; sip = self.sip_4_16;
pythonDBus = self.dbus; pythonDBus = self.dbus;
qt5 = pkgs.qt5; inherit (pkgs.qt5) qtbase qtsvg qtwebkit;
}; };
pyside = callPackage ../development/python-modules/pyside { }; pyside = callPackage ../development/python-modules/pyside { };