pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #223817 from panicgh/pyqt-fixes

authored by Sandro and committed by GitHub 8c980252 69db8711

+13 -2
unified split
+12 -1
pkgs/development/python-modules/pyqt/5.x.nix
··· 55 EOF 56 ''; 57 58 outputs = [ "out" "dev" ]; 59 60 dontWrapQtApps = true; ··· 117 ++ lib.optional withWebSockets "PyQt5.QtWebSockets" 118 ++ lib.optional withWebKit "PyQt5.QtWebKit" 119 ++ lib.optional withMultimedia "PyQt5.QtMultimedia" 120 - ++ lib.optional withConnectivity "PyQt5.QtConnectivity" 121 ++ lib.optional withLocation "PyQt5.QtPositioning" 122 ; 123
··· 55 EOF 56 ''; 57 58 + enableParallelBuilding = true; 59 + # HACK: paralellize compilation of make calls within pyqt's setup.py 60 + # pkgs/stdenv/generic/setup.sh doesn't set this for us because 61 + # make gets called by python code and not its build phase 62 + # format=pyproject means the pip-build-hook hook gets used to build this project 63 + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh 64 + # does not use the enableParallelBuilding flag 65 + postUnpack = '' 66 + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" 67 + ''; 68 + 69 outputs = [ "out" "dev" ]; 70 71 dontWrapQtApps = true; ··· 128 ++ lib.optional withWebSockets "PyQt5.QtWebSockets" 129 ++ lib.optional withWebKit "PyQt5.QtWebKit" 130 ++ lib.optional withMultimedia "PyQt5.QtMultimedia" 131 + ++ lib.optional withConnectivity "PyQt5.QtBluetooth" 132 ++ lib.optional withLocation "PyQt5.QtPositioning" 133 ; 134
+1 -1
pkgs/development/python-modules/pyqt/6.x.nix
··· 61 # pkgs/development/interpreters/python/hooks/pip-build-hook.sh 62 # does not use the enableParallelBuilding flag 63 postUnpack = '' 64 - export MAKEFLAGS+=" -j$NIX_BUILD_CORES" 65 ''; 66 67 outputs = [ "out" "dev" ];
··· 61 # pkgs/development/interpreters/python/hooks/pip-build-hook.sh 62 # does not use the enableParallelBuilding flag 63 postUnpack = '' 64 + export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}" 65 ''; 66 67 outputs = [ "out" "dev" ];