646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
24 lines
1021 B
Diff
24 lines
1021 B
Diff
--- a/vcs 2020-04-04 14:37:53.531095977 -0700
|
|
+++ b/vcs 2020-04-04 14:40:46.459407878 -0700
|
|
@@ -3669,18 +3669,8 @@
|
|
[[ ( -z $USR_FONT_TITLE ) && ( $FONT_TITLE != 'DejaVu-Sans-Book' ) ]] && return
|
|
[[ ( -z $USR_FONT_TSTAMPS ) && ( $FONT_TSTAMPS != 'DejaVu-Sans-Book' ) ]] && return
|
|
[[ ( -z $USR_FONT_SIGN ) && ( $FONT_SIGN != 'DejaVu-Sans-Book' ) ]] && return
|
|
- # Try to locate DejaVu Sans
|
|
- local dvs=''
|
|
- if [[ -d /usr/local/share/fonts ]]; then
|
|
- dvs=$(find /usr/local/share/fonts/ -type f -iname 'dejavusans.ttf')
|
|
- fi
|
|
- if [[ ( -z $dvs ) && ( -d /usr/share/fonts ) ]]; then
|
|
- dvs=$(find /usr/share/fonts/ -type f -iname 'dejavusans.ttf')
|
|
- fi
|
|
- if [[ -z $dvs ]]; then
|
|
- warn "Unable to locate DejaVu Sans font. Falling back to helvetica."
|
|
- dvs=helvetica
|
|
- fi
|
|
+ # Use DejaVu Sans, by default
|
|
+ local dvs='@dejavu_fonts@/share/fonts/truetype/DejaVuSans.ttf'
|
|
[[ -z $USR_FONT_HEADING ]] && FONT_HEADING="$dvs"
|
|
[[ -z $USR_FONT_TITLE ]] && FONT_TITLE="$dvs"
|
|
[[ -z $USR_FONT_TSTAMPS ]] && FONT_TSTAMPS="$dvs"
|