Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ac58340b1268
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1f62c54e759
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 3, 2020

  1. hplip: don't reference gcc in binaries from /share and other locations

    @doronbehar
    doronbehar committed Jun 3, 2020
    Copy the full SHA
    c59e8d3 View commit details

Commits on Jun 6, 2020

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

    hplip: don't reference gcc in binaries from /share and other locations
    @ttuegel
    ttuegel authored Jun 6, 2020
    Copy the full SHA
    d1f62c5 View commit details
Showing with 14 additions and 1 deletion.
  1. +5 −0 pkgs/misc/drivers/hplip/3.18.5.nix
  2. +9 −1 pkgs/misc/drivers/hplip/default.nix
5 changes: 5 additions & 0 deletions pkgs/misc/drivers/hplip/3.18.5.nix
View file
Original file line number Diff line number Diff line change
@@ -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:
10 changes: 9 additions & 1 deletion pkgs/misc/drivers/hplip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";