From 8ea50952b2c65c26a7e2ffd3262c25af053aa8ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 13 Nov 2019 15:35:36 +0100 Subject: [PATCH] hplip: use python2Packages While Python 3 is (partially) supported, it requires more effort to fix it. --- pkgs/misc/drivers/hplip/3.16.11.nix | 6 +++--- pkgs/misc/drivers/hplip/3.18.5.nix | 6 +++--- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 779325c99b0..993a5144a9d 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils +, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net_snmp, openssl, nettools , bash, coreutils, utillinux , qtSupport ? true @@ -45,7 +45,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2 diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index d95eb85168e..3b78f015f7d 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net_snmp, openssl, perl, nettools , bash, coreutils, utillinux @@ -47,7 +47,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -69,7 +69,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2 diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 978fd9b9e03..fe890f3dce2 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net_snmp, openssl, perl, nettools , bash, coreutils, utillinux @@ -46,7 +46,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -68,7 +68,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2