diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-17 16:48:02 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-17 20:20:35 +0300 |
| commit | 33cabd882f0cc6cd21d868653bd017ece86dd108 (patch) | |
| tree | 0db4c91603d3004224edc347853372ffd5741647 /pkgs/development/python-modules | |
| parent | 13fdb45c04781d58bb5c6ae28d995b5d994ae821 (diff) | |
| download | nixlib-33cabd882f0cc6cd21d868653bd017ece86dd108.tar nixlib-33cabd882f0cc6cd21d868653bd017ece86dd108.tar.gz nixlib-33cabd882f0cc6cd21d868653bd017ece86dd108.tar.bz2 nixlib-33cabd882f0cc6cd21d868653bd017ece86dd108.tar.lz nixlib-33cabd882f0cc6cd21d868653bd017ece86dd108.tar.xz nixlib-33cabd882f0cc6cd21d868653bd017ece86dd108.tar.zst nixlib-33cabd882f0cc6cd21d868653bd017ece86dd108.zip | |
pythonPackages.pyqt5: 5.5.1 -> 5.6
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 7418c4785e90..f5ee50a73522 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit +{ stdenv, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, dbus_libs , lndir, makeWrapper, qmakeHook }: let - version = "5.5.1"; - inherit (pythonPackages) python dbus-python; - sip = pythonPackages.sip_4_16; + version = "5.6"; + inherit (pythonPackages) python dbus-python sip; in stdenv.mkDerivation { name = "${python.libPrefix}-PyQt-${version}"; @@ -17,13 +16,13 @@ in stdenv.mkDerivation { }; src = fetchurl { - url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz"; - sha256 = "11l3pm0wkwkxzw4n3022iid3yyia5ap4l0ny1m5ngkzzzfafyw0a"; + url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; + sha256 = "1qgh42zsr9jppl9k7fcdbhxcd1wrb7wyaj9lng9nxfa19in1lj1f"; }; buildInputs = [ pkgconfig makeWrapper lndir - qtbase qtsvg qtwebkit qmakeHook + qtbase qtsvg qtwebkit dbus_libs qmakeHook ]; propagatedBuildInputs = [ sip python ]; @@ -42,12 +41,13 @@ in stdenv.mkDerivation { ${python.executable} configure.py -w \ --confirm-license \ - --dbus=$out/include/dbus-1.0 \ + --dbus=${dbus_libs.dev}/include/dbus-1.0 \ --qmake=$QMAKE \ --no-qml-plugin \ --bindir=$out/bin \ - --destdir=$out/lib/${python.libPrefix}/site-packages \ - --sipdir=$out/share/sip \ + --destdir=$out/${python.sitePackages} \ + --stubsdir=$out/${python.sitePackages}/PyQt5 \ + --sipdir=$out/share/sip/PyQt5 \ --designer-plugindir=$out/plugins/designer runHook postConfigure |