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
base: cae18d135f80
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 40e8aaefb121
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 13, 2021

  1. hplip: fix hp-setup crash by adding proper NixOS PPD search path 

    HPLIP's getSystemPPDs() function relies on searching for PPDs below common FHS
paths.  None of these exist on NixOS, but the code assumes that at least one of
the directories will be found, and crashes when it doesn't (cups_ppd_path is
None and the code passes that to os.path.join).

A usable PPD search path for the running system on NixOS is
/var/lib/cups/path/share, so this patches the source to check this path as well.
This should fix the NixOS case and keep non-NixOS cases working too.

(cherry picked from commit 60df55c)
    @khumba @erictapen
    khumba authored and erictapen committed Jan 13, 2021
    Copy the full SHA
    40e8aae View commit details
    Browse the repository at this point in the history