Merge pull request #90609 from bkchr/bkchr-fix-hplip
hplip: Fix missing library
This commit is contained in:
commit
23c90919b6
|
@ -5,7 +5,7 @@
|
||||||
, net-snmp, openssl, perl, nettools
|
, net-snmp, openssl, perl, nettools
|
||||||
, bash, coreutils, utillinux
|
, bash, coreutils, utillinux
|
||||||
# To remove references to gcc-unwrapped
|
# To remove references to gcc-unwrapped
|
||||||
, removeReferencesTo
|
, removeReferencesTo, qt5
|
||||||
, withQt5 ? true
|
, withQt5 ? true
|
||||||
, withPlugin ? false
|
, withPlugin ? false
|
||||||
, withStaticPPDInstall ? false
|
, withStaticPPDInstall ? false
|
||||||
|
@ -67,12 +67,15 @@ python3Packages.buildPythonApplication {
|
||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig removeReferencesTo ];
|
nativeBuildInputs = [
|
||||||
|
pkgconfig
|
||||||
|
removeReferencesTo
|
||||||
|
] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook;
|
||||||
|
|
||||||
pythonPath = with python3Packages; [
|
pythonPath = with python3Packages; [
|
||||||
dbus
|
dbus
|
||||||
pillow
|
pillow
|
||||||
pygobject2
|
pygobject3
|
||||||
reportlab
|
reportlab
|
||||||
usbutils
|
usbutils
|
||||||
sip
|
sip
|
||||||
|
@ -219,6 +222,10 @@ python3Packages.buildPythonApplication {
|
||||||
--replace {,${utillinux}/bin/}logger \
|
--replace {,${utillinux}/bin/}logger \
|
||||||
--replace {/usr,$out}/bin
|
--replace {/usr,$out}/bin
|
||||||
remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so)
|
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.
|
# There are some binaries there, which reference gcc-unwrapped otherwise.
|
||||||
|
|
Loading…
Reference in a new issue