From 3b0bc6354a5242eb36bdb85e2d74dc10b4c7e4f1 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 19 Oct 2019 09:44:27 +0000
Subject: [PATCH] plover.dev: apply the Qt wrapper

Without this, it crashes instantly at startup looking for the
Qt xcb plugin.

Co-authored-by: Kovacsics Robert <rmk35@cam.ac.uk>
---
 pkgs/applications/misc/plover/default.nix | 10 ++++++++--
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index f7019d1eea82..77e93eaba7e9 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }:
+{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl,
+  qtbase, mkDerivationWith }:
 
 {
   stable = with python27Packages; buildPythonPackage rec {
@@ -23,7 +24,7 @@
     ];
   };
 
-  dev = with python36Packages; buildPythonPackage rec {
+  dev = with python36Packages; mkDerivationWith buildPythonPackage rec {
     pname = "plover";
     version = "4.0.0.dev8";
 
@@ -44,5 +45,10 @@
 
     checkInputs           = [ pytest mock ];
     propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
+
+    dontWrapQtApps = true;
+    makeWrapperArgs = [
+      "\${qtWrapperArgs[@]}"
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e239164a5c45..324f62e84b58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20285,7 +20285,7 @@ in
 
   plex-media-player = libsForQt59.callPackage ../applications/video/plex-media-player { };
 
-  plover = recurseIntoAttrs (callPackage ../applications/misc/plover { });
+  plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
 
   plugin-torture = callPackage ../applications/audio/plugin-torture { };