Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00
parent f8472457a4 53b389327e
commit 716aac2519
1293 changed files with 75245 additions and 28520 deletions
--- a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
+++ b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
@@ -1,4 +1,4 @@
-p=( $(for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq) )
+p=( $(fc-list : file | sed "s@/[^/]*: @@" | sort -u) )
 IFS=:
 export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}"
 unset IFS p