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

pythonPackages.pyqt5: 5.5.1 -> 5.6

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-08-17 16:48:02 +03:00
parent 13fdb45c04
commit 33cabd882f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,9 @@
{ stdenv, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit { stdenv, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, dbus_libs
, lndir, makeWrapper, qmakeHook }: , lndir, makeWrapper, qmakeHook }:
let let
version = "5.5.1"; version = "5.6";
inherit (pythonPackages) python dbus-python; inherit (pythonPackages) python dbus-python sip;
sip = pythonPackages.sip_4_16;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${python.libPrefix}-PyQt-${version}"; name = "${python.libPrefix}-PyQt-${version}";
@ -17,13 +16,13 @@ in stdenv.mkDerivation {
}; };
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz"; url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
sha256 = "11l3pm0wkwkxzw4n3022iid3yyia5ap4l0ny1m5ngkzzzfafyw0a"; sha256 = "1qgh42zsr9jppl9k7fcdbhxcd1wrb7wyaj9lng9nxfa19in1lj1f";
}; };
buildInputs = [ buildInputs = [
pkgconfig makeWrapper lndir pkgconfig makeWrapper lndir
qtbase qtsvg qtwebkit qmakeHook qtbase qtsvg qtwebkit dbus_libs qmakeHook
]; ];
propagatedBuildInputs = [ sip python ]; propagatedBuildInputs = [ sip python ];
@ -42,12 +41,13 @@ in stdenv.mkDerivation {
${python.executable} configure.py -w \ ${python.executable} configure.py -w \
--confirm-license \ --confirm-license \
--dbus=$out/include/dbus-1.0 \ --dbus=${dbus_libs.dev}/include/dbus-1.0 \
--qmake=$QMAKE \ --qmake=$QMAKE \
--no-qml-plugin \ --no-qml-plugin \
--bindir=$out/bin \ --bindir=$out/bin \
--destdir=$out/lib/${python.libPrefix}/site-packages \ --destdir=$out/${python.sitePackages} \
--sipdir=$out/share/sip \ --stubsdir=$out/${python.sitePackages}/PyQt5 \
--sipdir=$out/share/sip/PyQt5 \
--designer-plugindir=$out/plugins/designer --designer-plugindir=$out/plugins/designer
runHook postConfigure runHook postConfigure

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

@ -268,7 +268,7 @@ in modules // {
pythonPackages = self; pythonPackages = self;
}; };
pyqt5 = pkgs.qt55.callPackage ../development/python-modules/pyqt/5.x.nix { pyqt5 = pkgs.qt5.callPackage ../development/python-modules/pyqt/5.x.nix {
pythonPackages = self; pythonPackages = self;
}; };