diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-22 02:19:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-22 02:19:59 +0200 |
commit | 5ea865562be7d21f57bf8bb1634c72ebe57e5be8 (patch) | |
tree | ec4cbd9577638c7182a3219ffee40cab65cbefe5 /pkgs/tools | |
parent | 99d4811deee437015cb61f683b66f56feb21e86b (diff) | |
parent | 5871962ba579ffef8475300c5f6ed5bfba7f97b9 (diff) | |
download | nixpkgs-5ea865562be7d21f57bf8bb1634c72ebe57e5be8.tar nixpkgs-5ea865562be7d21f57bf8bb1634c72ebe57e5be8.tar.gz nixpkgs-5ea865562be7d21f57bf8bb1634c72ebe57e5be8.tar.bz2 nixpkgs-5ea865562be7d21f57bf8bb1634c72ebe57e5be8.tar.lz nixpkgs-5ea865562be7d21f57bf8bb1634c72ebe57e5be8.tar.xz nixpkgs-5ea865562be7d21f57bf8bb1634c72ebe57e5be8.tar.zst nixpkgs-5ea865562be7d21f57bf8bb1634c72ebe57e5be8.zip |
Merge pull request #130989 from Artturin/virtscreen-unbreak
virtscreen: unbreak
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/virtscreen/default.nix | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index ebfd6c21772..a1558248f80 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, x11vnc +, xrandr +, libGL +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "virtscreen"; @@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec { sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ netifaces pyqt5 @@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec { xrandr ]; - postPatch = let - ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + # import Qt.labs.platform failed without this + "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" + ]; + + postPatch = '' substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ ''; meta = with lib; { |