Skip to content

Commit

Permalink
Merge pull request #90609 from bkchr/bkchr-fix-hplip
Browse files Browse the repository at this point in the history
hplip: Fix missing library
  • Loading branch information
flokli authored Jun 16, 2020
2 parents 27094ee + 907353b commit 23c9091
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions pkgs/misc/drivers/hplip/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 23c9091

Please sign in to comment.