It seems that the OpenOffice.org desktop files have wrong icon identifiers. I corrected them now. Maybe I'll win the most wasted builtime award now

svn path=/nixpkgs/trunk/; revision=17835

1 files changed, 9 insertions, 1 deletions

diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index c6400a5085dfc..a7a1fd58bec46 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -76,6 +76,14 @@ installPhase() {
     # the application menu in KDE and GNOME
     ensureDir $out/share
     ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications
+
+    # Apply a minor correction to the *.desktop files in order to correctly address the icons
+    # The openoffice- prefix should be removed from the icon identifiers
+    for appl in *.desktop
+    do
+        sed -i '/Icon/d' $appl
+        echo "Icon=`echo $appl | sed 's/.desktop//'`" >> $appl    
+    done
     
     # Copy icons so that the menu items in KDE and GNOME will look much nicer
     (cd $SRC_ROOT/sysui/desktop/icons
@@ -83,7 +91,7 @@ installPhase() {
      cp -rv hicolor/*x* $out/share/icons/hicolor
      cp -rv locolor/*x* $out/share/icons/locolor
     )
-    
+        
     # The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice
     ln -s $out/bin/soffice $out/bin/openoffice.org3
 }