Improve LibreOffice src list generation

3 files changed, 14 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;
       ;;
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
new file mode 100644
index 00000000000..dcc12a1a7b0
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
@@ -0,0 +1 @@
+EVAL additions_libgltf='  subDir = "libgltf";'
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 0e7525782c6..cf9a2711347 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -323,6 +323,7 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
+  subDir = "libgltf";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";