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

Merge pull request #75910 from grahamc/python3/hplip

Browse Source 
hplip: python2 -> python3
This commit is contained in:
Graham Christensen 2019-12-19 08:19:30 -05:00 committed by GitHub
commit 35b56558a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/misc/drivers/hplip/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll { stdenv, fetchurl, substituteAll
, pkgconfig , pkgconfig
, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends
, dbus, file, ghostscript, usbutils , dbus, file, ghostscript, usbutils
, net_snmp, openssl, perl, nettools , net_snmp, openssl, perl, nettools
, bash, coreutils, utillinux , bash, coreutils, utillinux
@ -46,7 +46,7 @@ in
assert withPlugin -> builtins.elem hplipArch pluginArches assert withPlugin -> builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}";
python2Packages.buildPythonApplication { python3Packages.buildPythonApplication {
inherit name src; inherit name src;
format = "other"; format = "other";
@ -68,13 +68,14 @@ python2Packages.buildPythonApplication {
pkgconfig pkgconfig
]; ];
pythonPath = with python2Packages; [ pythonPath = with python3Packages; [
dbus dbus
pillow pillow
pygobject2 pygobject2
reportlab reportlab
usbutils usbutils
sip sip
dbus-python
] ++ stdenv.lib.optionals withQt5 [ ] ++ stdenv.lib.optionals withQt5 [
pyqt5 pyqt5
enum-compat enum-compat