Merge pull request #130989 from Artturin/virtscreen-unbreak

virtscreen: unbreak
This commit is contained in:
Sandro 2021-07-22 02:19:59 +02:00 committed by GitHub
commit 5ea865562b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,12 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: { lib
, stdenv
, fetchFromGitHub
, python3Packages
, x11vnc
, xrandr
, libGL
, qt5
}:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "virtscreen"; pname = "virtscreen";
@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec {
sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08";
}; };
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
netifaces netifaces
pyqt5 pyqt5
@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec {
xrandr xrandr
]; ];
postPatch = let dontWrapQtApps = true;
ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
# import Qt.labs.platform failed without this
"--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}"
];
postPatch = ''
substituteInPlace virtscreen/__main__.py \ substituteInPlace virtscreen/__main__.py \
--replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \
''; '';
meta = with lib; { meta = with lib; {