mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
60df55c9fb
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.
25 lines
797 B
Diff
25 lines
797 B
Diff
From: Bryan Gardiner <bog@khumba.net>
|
|
Date: Sat, 9 Jan 2021 16:51:20 -0800
|
|
Subject: [PATCH] Add NixOS CUPS PPD search path.
|
|
|
|
---
|
|
base/g.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/base/g.py b/base/g.py
|
|
index f73e23f..758f339 100644
|
|
--- a/base/g.py
|
|
+++ b/base/g.py
|
|
@@ -283,7 +283,7 @@ prop.max_message_len = 8192
|
|
prop.max_message_read = 65536
|
|
prop.read_timeout = 90
|
|
|
|
-prop.ppd_search_path = '/usr/share;/usr/local/share;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64'
|
|
+prop.ppd_search_path = '/var/lib/cups/path/share;/usr/share;/usr/local/share;/usr/lib;/usr/local/lib;/usr/libexec;/opt;/usr/lib64'
|
|
prop.ppd_search_pattern = 'HP-*.ppd.*'
|
|
prop.ppd_download_url = 'http://www.linuxprinting.org/ppd-o-matic.cgi'
|
|
prop.ppd_file_suffix = '-hpijs.ppd'
|
|
--
|
|
2.29.2
|
|
|