about summary refs log tree commit diff
path: root/pkgs/applications/office/libreoffice
diff options
context:
space:
mode:
authorMoritz 'e1mo' Fromm <git@e1mo.de>2023-03-14 11:53:31 +0100
committerMoritz 'e1mo' Fromm <git@e1mo.de>2023-03-14 11:53:31 +0100
commit825a34ea3bff75283e152b9846cbc7ee39a007ae (patch)
tree46b4178fa8bb5d53c9f165f96b7341d69c03aa44 /pkgs/applications/office/libreoffice
parent3c66f2de15281ed7925ac08c6ca6f64729b39bf9 (diff)
downloadnixlib-825a34ea3bff75283e152b9846cbc7ee39a007ae.tar
nixlib-825a34ea3bff75283e152b9846cbc7ee39a007ae.tar.gz
nixlib-825a34ea3bff75283e152b9846cbc7ee39a007ae.tar.bz2
nixlib-825a34ea3bff75283e152b9846cbc7ee39a007ae.tar.lz
nixlib-825a34ea3bff75283e152b9846cbc7ee39a007ae.tar.xz
nixlib-825a34ea3bff75283e152b9846cbc7ee39a007ae.tar.zst
nixlib-825a34ea3bff75283e152b9846cbc7ee39a007ae.zip
libreoffice: improve out/share looping in wrapper
The copying/linking implemented in #220694 resulted in a higher
maintenance burden (need to manually add all new folders in $out/share).
The introduced loop will continue linking everything but the .desktop
files.
Diffstat (limited to 'pkgs/applications/office/libreoffice')
-rw-r--r--pkgs/applications/office/libreoffice/wrapper.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix
index c44ca11c4325..13819a0fb5ec 100644
--- a/pkgs/applications/office/libreoffice/wrapper.nix
+++ b/pkgs/applications/office/libreoffice/wrapper.nix
@@ -89,12 +89,16 @@ in runCommand "${unwrapped.name}-wrapped" {
 } (''
   mkdir -p "$out/bin"
   mkdir -p "$out/share"
+  for dir in ${unwrapped}/share/*; do
+    dirname="''${dir##*/}"
+    if [[ $dirname == "applications" ]]; then
+      cp -r $dir/ $out/share/
+    else
+      ln -s $dir $out/share/
+    fi
+  done
 
-  ln -s ${unwrapped}/share/icons $out/share/icons
-  ln -s ${unwrapped}/share/templates $out/share/templates
   ln -s ${unwrapped}/lib $out/lib
-
-  cp -r ${unwrapped}/share/applications/ $out/share/
   for f in $out/share/applications/*.desktop; do
     substituteInPlace "$f" \
       --replace "Exec=libreoffice${major}.${minor}" "Exec=soffice"