diff options
Diffstat (limited to 'pkgs/misc/drivers/hplip/default.nix')
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 7c9eb35b9af4..98ced28b8773 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -5,7 +5,7 @@ , net-snmp, openssl, perl, nettools , bash, coreutils, utillinux # To remove references to gcc-unwrapped -, removeReferencesTo +, removeReferencesTo, qt5 , withQt5 ? true , withPlugin ? false , withStaticPPDInstall ? false @@ -14,16 +14,16 @@ let name = "hplip-${version}"; - version = "3.20.3"; + version = "3.20.5"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1"; + sha256 = "004bbd78487b7803cdcf2a96b00de938797227068c4de43ee7ad7d174c4e475a"; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; - sha256 = "13xyv30jqjysfk7gh0gyn7qj0pb0qvk2rlbhm85a3lw7bjycal8g"; + sha256 = "ff3dedda3158be64b985efbf636890ddda5b271ae1f1fbd788219e1344a9c2e7"; }; hplipState = substituteAll { @@ -67,12 +67,15 @@ python3Packages.buildPythonApplication { zlib ]; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ + pkgconfig + removeReferencesTo + ] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook; pythonPath = with python3Packages; [ dbus pillow - pygobject2 + pygobject3 reportlab usbutils sip @@ -219,6 +222,10 @@ python3Packages.buildPythonApplication { --replace {,${utillinux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) + '' + stdenv.lib.optionalString withQt5 '' + for f in $out/bin/hp-*;do + wrapQtApp $f + done ''; # There are some binaries there, which reference gcc-unwrapped otherwise. |