diff options
| author | Bastian Köcher <git@kchr.de> | 2018-05-26 09:13:38 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-06-12 14:27:11 +0200 |
| commit | 121b15f0c0d96e756d0b97b2727271de794a300d (patch) | |
| tree | d2fa4583791ee519f6f00ca89377d7110a448409 /pkgs/development/python-modules/pyqt | |
| parent | 5fe81d07ba0b03789eb81fe7d4d3019e7ee122ba (diff) | |
| download | nixpkgs-121b15f0c0d96e756d0b97b2727271de794a300d.tar nixpkgs-121b15f0c0d96e756d0b97b2727271de794a300d.tar.gz nixpkgs-121b15f0c0d96e756d0b97b2727271de794a300d.tar.bz2 nixpkgs-121b15f0c0d96e756d0b97b2727271de794a300d.tar.lz nixpkgs-121b15f0c0d96e756d0b97b2727271de794a300d.tar.xz nixpkgs-121b15f0c0d96e756d0b97b2727271de794a300d.tar.zst nixpkgs-121b15f0c0d96e756d0b97b2727271de794a300d.zip | |
pyqt5: Fixes build with Qt 5.11
Diffstat (limited to 'pkgs/development/python-modules/pyqt')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index d9de2edce68..b669c145641 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,5 @@ -{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake, fetchpatch -, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs +{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper +, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity }: @@ -73,6 +73,16 @@ in buildPythonPackage { url = https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/pyqt5-cura-crash.patch?id=6cfe64a3d1827e0ed9cc62f1683a53b582315f4f; sha256 = "02a0mw1z8p9hhqhl4bgjrmf1xq82xjmpivn5bg6r4yv6pidsh7ck"; }) + (fetchpatch { + name = "pyqt-qt5.11.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-qt5.11.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97"; + sha256 = "0qa7w1agjg9da99lvnqwwxnm3pp7qd683h7zggq4c269y2km812h"; + }) + (fetchpatch { + name = "pyqt-support-new-qt.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-support-new-qt.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97"; + sha256 = "1nkl96f4bki37zw6iwvd4vq8z8gg45q5m1cbkbaw72395i0m7p5j"; + }) ]; postInstall = '' |