Merge pull request #89265 from doronbehar/hplip-gcc-references

hplip: don't reference gcc in binaries from /share and other locations
This commit is contained in:
Thomas Tuegel 2020-06-06 10:21:07 -05:00 committed by GitHub
commit d1f62c54e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions

View File

@ -199,6 +199,11 @@ python2Packages.buildPythonApplication {
done
'';
# There are some binaries there, which reference gcc-unwrapped otherwise.
stripDebugList = [
"share/hplip"
];
postFixup = ''
substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
# Patch udev rules:

View File

@ -4,6 +4,8 @@
, dbus, file, ghostscript, usbutils
, net-snmp, openssl, perl, nettools
, bash, coreutils, utillinux
# To remove references to gcc-unwrapped
, removeReferencesTo
, withQt5 ? true
, withPlugin ? false
, withStaticPPDInstall ? false
@ -65,7 +67,7 @@ python3Packages.buildPythonApplication {
zlib
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig removeReferencesTo ];
pythonPath = with python3Packages; [
dbus
@ -216,8 +218,14 @@ python3Packages.buildPythonApplication {
--replace /usr/bin/nohup "" \
--replace {,${utillinux}/bin/}logger \
--replace {/usr,$out}/bin
remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so)
'';
# There are some binaries there, which reference gcc-unwrapped otherwise.
stripDebugList = [
"share/hplip" "lib/cups/backend" "lib/cups/filter" "lib/python3.7/site-packages" "lib/sane"
];
meta = with stdenv.lib; {
description = "Print, scan and fax HP drivers for Linux";
homepage = "https://developers.hp.com/hp-linux-imaging-and-printing";