nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

hplip: fix dependencies

Browse Source 
Wrapping with gobject-introspection is required so that hp-systray is able to
find dbus. Sip4 is outdated and seems no longer required.
This commit is contained in:
Alois Wohlschlager 2024-07-07 06:45:54 +02:00
parent feb2849fde
commit ac20a96efd
No known key found for this signature in database
GPG Key ID: E0F59EA5E5216914
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, substituteAll { lib, stdenv, fetchurl, substituteAll
, pkg-config, autoreconfHook , pkg-config, autoreconfHook, gobject-introspection, wrapGAppsHook3
, cups, zlib, libjpeg, libusb1, python311Packages, sane-backends , cups, zlib, libjpeg, libusb1, python311Packages, sane-backends
, dbus, file, ghostscript, usbutils , dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools, avahi , net-snmp, openssl, perl, nettools, avahi
@ -74,6 +74,8 @@ python311Packages.buildPythonApplication {
pkg-config pkg-config
removeReferencesTo removeReferencesTo
autoreconfHook autoreconfHook
gobject-introspection
wrapGAppsHook3
] ++ lib.optional withQt5 qt5.wrapQtAppsHook; ] ++ lib.optional withQt5 qt5.wrapQtAppsHook;
pythonPath = with python311Packages; [ pythonPath = with python311Packages; [
@ -82,7 +84,6 @@ python311Packages.buildPythonApplication {
pygobject3 pygobject3
reportlab reportlab
usbutils usbutils
sip4
dbus-python dbus-python
distro distro
] ++ lib.optionals withQt5 [ ] ++ lib.optionals withQt5 [
@ -239,7 +240,8 @@ python311Packages.buildPythonApplication {
# 1. Calling patchPythonProgram on the original script in $out/share/hplip # 1. Calling patchPythonProgram on the original script in $out/share/hplip
# 2. Making our own wrapper pointing directly to the original script. # 2. Making our own wrapper pointing directly to the original script.
dontWrapPythonPrograms = true; dontWrapPythonPrograms = true;
# We also avoid double wrapping in case we add qt5 support # We also avoid double (or triple in case qt5 support is added) wrapping
dontWrapGApps = true;
dontWrapQtApps = true; dontWrapQtApps = true;
preFixup = '' preFixup = ''
buildPythonPath "$out $pythonPath" buildPythonPath "$out $pythonPath"
@ -253,7 +255,7 @@ python311Packages.buildPythonApplication {
${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \ ${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \
--prefix PATH ':' "$program_PATH" \ --prefix PATH ':' "$program_PATH" \
--set PYTHONNOUSERSITE "true" \ --set PYTHONNOUSERSITE "true" \
$makeWrapperArgs $makeWrapperArgs "''${gappsWrapperArgs[@]}"
done done
''; '';