patchPpdFilesHook: share/ppds -> share/ppd
This was an oversight in commit
335a9083b0 .
The Wikipedia article referenced there
https://en.wikipedia.org/wiki/PostScript_Printer_Description#CUPS
clearly states that ppd file locations are
`/usr/share/ppd/` or `/usr/share/cups/model/`.
Even the version of that article
from that commit's time says so.
I don't know what dark force made me consistently
change that to `/usr/share/ppds/`. *sigh*.
This commit is contained in:
@@ -5,7 +5,7 @@ fixupOutputHooks+=(_patchPpdFileCommands4fixupOutputHooks)
|
||||
# Install a hook for the `fixupPhase`:
|
||||
# If the variable `ppdFileCommands` contains a list of
|
||||
# executable names, the hook calls `patchPpdFileCommands`
|
||||
# on each output's `/share/cups/model` and `/share/ppds`
|
||||
# on each output's `/share/cups/model` and `/share/ppd`
|
||||
# directories in order to replace calls to those executables.
|
||||
|
||||
_patchPpdFileCommands4fixupOutputHooks () {
|
||||
@@ -13,8 +13,8 @@ _patchPpdFileCommands4fixupOutputHooks () {
|
||||
if [[ -d $prefix/share/cups/model ]]; then
|
||||
patchPpdFileCommands "$prefix/share/cups/model" $ppdFileCommands
|
||||
fi
|
||||
if [[ -d $prefix/share/ppds ]]; then
|
||||
patchPpdFileCommands "$prefix/share/ppds" $ppdFileCommands
|
||||
if [[ -d $prefix/share/ppd ]]; then
|
||||
patchPpdFileCommands "$prefix/share/ppd" $ppdFileCommands
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -33,10 +33,10 @@ stdenv.mkDerivation {
|
||||
ppdFileCommands = [ "cmp" ];
|
||||
preFixup = ''
|
||||
install -D "${input}" "${placeholder "out"}/share/cups/model/test.ppd"
|
||||
install -D "${input}" "${placeholder "out"}/share/ppds/test.ppd"
|
||||
install -D "${input}" "${placeholder "out"}/share/ppd/test.ppd"
|
||||
'';
|
||||
postFixup = ''
|
||||
diff --color --report-identical-files "${output}" "${placeholder "out"}/share/cups/model/test.ppd"
|
||||
diff --color --report-identical-files "${output}" "${placeholder "out"}/share/ppds/test.ppd"
|
||||
diff --color --report-identical-files "${output}" "${placeholder "out"}/share/ppd/test.ppd"
|
||||
'';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user