JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71335 from edef1c/plover-deps

Browse Source 
Add missing Plover deps
This commit is contained in:
worldofpeace 2019-10-21 10:19:24 +00:00 committed by GitHub
commit 1a25b14048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/plover/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }: { stdenv, fetchurl, python27Packages, python36Packages, wmctrl,
qtbase, mkDerivationWith }:
{ {
stable = with python27Packages; buildPythonPackage rec { stable = with python27Packages; buildPythonPackage rec {
@ -19,11 +20,11 @@
nativeBuildInputs = [ setuptools_scm ]; nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ pytest mock ]; buildInputs = [ pytest mock ];
propagatedBuildInputs = [ propagatedBuildInputs = [
six setuptools pyserial appdirs hidapi wxPython xlib wmctrl six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python
]; ];
}; };
dev = with python36Packages; buildPythonPackage rec { dev = with python36Packages; mkDerivationWith buildPythonPackage rec {
pname = "plover"; pname = "plover";
version = "4.0.0.dev8"; version = "4.0.0.dev8";
@ -43,6 +44,11 @@
postPatch = "sed -i /PyQt5/d setup.cfg"; postPatch = "sed -i /PyQt5/d setup.cfg";
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];
propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth ]; propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
dontWrapQtApps = true;
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -20307,7 +20307,7 @@ in
plex-media-player = libsForQt59.callPackage ../applications/video/plex-media-player { }; 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 { }; plugin-torture = callPackage ../applications/audio/plugin-torture { };