Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.

1 files changed, 12 insertions, 0 deletions

diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
index d77b41a0480..bba1ad9c213 100755
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
@@ -1,7 +1,11 @@
 #!/run/current-system/sw/bin/bash
 
+# Ideally we would move as much as possible into derivation dependencies
+
 # Take the list of files from the main package, ooo.lst.in
 
+# This script wants an argument: download list file
+
 cat <<EOF
 [
 EOF
@@ -11,11 +15,18 @@ write_entry(){
   echo "  name = \"${name}\";"
   echo "  md5 = \"${md5}\";"
   echo "  brief = ${brief};"
+  eval "echo -n \"\$additions_${name%%[-_.]*}\""
+  eval "test -n \"\$additions_${name%%[-_.]*}\" && echo"
   echo '}'
 }
 
+cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" |
 while read line; do
   case "$line" in
+    EVAL\ *)
+      echo "${line#* }" >&2;
+      eval "${line#* }";
+      ;;
     \#*)
       echo Skipping comment: "$line" >&2;
       ;;
@@ -42,6 +53,7 @@ while read line; do
       line="${line#,}"
       md5=${line:0:32};
       name=${line:33};
+      name="${name%)}"
       brief=false;
       write_entry;
       ;;