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

hplip: use python2Packages

Browse Source 
While Python 3 is (partially) supported, it requires more effort to fix
it.
This commit is contained in:
Frederik Rietdijk 2019-11-13 15:35:36 +01:00
parent 5004cc90f6
commit 8ea50952b2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/misc/drivers/hplip/3.16.11.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll { stdenv, fetchurl, substituteAll
, pkgconfig , pkgconfig
, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils
, net_snmp, openssl, nettools , net_snmp, openssl, nettools
, bash, coreutils, utillinux , bash, coreutils, utillinux
, qtSupport ? true , qtSupport ? true
@ -45,7 +45,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}";
pythonPackages.buildPythonApplication { python2Packages.buildPythonApplication {
inherit name src; inherit name src;
format = "other"; format = "other";
@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication {
pkgconfig pkgconfig
]; ];
pythonPath = with pythonPackages; [ pythonPath = with python2Packages; [
dbus dbus
pillow pillow
pygobject2 pygobject2

6
pkgs/misc/drivers/hplip/3.18.5.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll { stdenv, fetchurl, substituteAll
, pkgconfig , pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends , cups, zlib, libjpeg, libusb1, python2Packages, 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
@ -47,7 +47,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}";
pythonPackages.buildPythonApplication { python2Packages.buildPythonApplication {
inherit name src; inherit name src;
format = "other"; format = "other";
@ -69,7 +69,7 @@ pythonPackages.buildPythonApplication {
pkgconfig pkgconfig
]; ];
pythonPath = with pythonPackages; [ pythonPath = with python2Packages; [
dbus dbus
pillow pillow
pygobject2 pygobject2

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll { stdenv, fetchurl, substituteAll
, pkgconfig , pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends , cups, zlib, libjpeg, libusb1, python2Packages, 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}";
pythonPackages.buildPythonApplication { python2Packages.buildPythonApplication {
inherit name src; inherit name src;
format = "other"; format = "other";
@ -68,7 +68,7 @@ pythonPackages.buildPythonApplication {
pkgconfig pkgconfig
]; ];
pythonPath = with pythonPackages; [ pythonPath = with python2Packages; [
dbus dbus
pillow pillow
pygobject2 pygobject2