diff options
| author | Johannes Frankenau <johannes@frankenau.net> | 2018-06-07 11:46:40 +0200 |
|---|---|---|
| committer | Johannes Frankenau <johannes@frankenau.net> | 2018-06-10 10:17:19 +0200 |
| commit | 163c83e901b8f0cfa065d66bd0ef9a9772671988 (patch) | |
| tree | 954f4de18689d12ad5ca22279ce9c940ae94b4a7 /pkgs/development/python-modules/pyqt | |
| parent | 07ebb8bb792be16de33596e2cea120eb72b2ec77 (diff) | |
| download | nixpkgs-163c83e901b8f0cfa065d66bd0ef9a9772671988.tar nixpkgs-163c83e901b8f0cfa065d66bd0ef9a9772671988.tar.gz nixpkgs-163c83e901b8f0cfa065d66bd0ef9a9772671988.tar.bz2 nixpkgs-163c83e901b8f0cfa065d66bd0ef9a9772671988.tar.lz nixpkgs-163c83e901b8f0cfa065d66bd0ef9a9772671988.tar.xz nixpkgs-163c83e901b8f0cfa065d66bd0ef9a9772671988.tar.zst nixpkgs-163c83e901b8f0cfa065d66bd0ef9a9772671988.zip | |
python.pkgs.pyqt5: apply patch for cura segfaults
Diffstat (limited to 'pkgs/development/python-modules/pyqt')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 331366e379d..d9de2edce68 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake +{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake, fetchpatch , lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs , withWebSockets ? false, qtwebsockets , withConnectivity ? false, qtconnectivity @@ -64,6 +64,17 @@ in buildPythonPackage { runHook postConfigure ''; + patches = [ + # This patch from Arch Linux fixes Cura segfaulting on startup + # https://github.com/Ultimaker/Cura/issues/3438 + # It can probably removed on 5.10.3 + (fetchpatch { + name = "pyqt5-cura-crash.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/pyqt5-cura-crash.patch?id=6cfe64a3d1827e0ed9cc62f1683a53b582315f4f; + sha256 = "02a0mw1z8p9hhqhl4bgjrmf1xq82xjmpivn5bg6r4yv6pidsh7ck"; + }) + ]; + postInstall = '' for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" |