Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'

1 files changed, 20 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/applications/office/libreoffice/still.nix b/nixpkgs/pkgs/applications/office/libreoffice/still.nix
index 64b12263e9a5..1da6160e85bb 100644
--- a/nixpkgs/pkgs/applications/office/libreoffice/still.nix
+++ b/nixpkgs/pkgs/applications/office/libreoffice/still.nix
@@ -48,14 +48,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1rk8f77gwqyrnrxpfrvmr03n49bb09idxwzzindxxgcagh3d0p5f";
+      sha256 = "15fdni68b3kyl6115v0d24cl0dp1hdjhkx571w086lrpz0fk9mfi";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "076xq1vlsyi2fv3r7rw595075pi08slbzwwc5h9gda3frx1jkj4i";
+      sha256 = "0bfjg14bnqlqwjcc3lkax0nfrhpm6nrqn7ycrmf4r3dzn10lgr64";
     };
 
   };
@@ -68,17 +68,23 @@ in stdenv.mkDerivation rec {
   # of rasqal/rasqal.h
   NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
 
-  patches = [ ./xdg-open-brief.patch ];
+  patches = [
+    ./xdg-open-brief.patch
+  ];
+
+  tarballPath = "external/tarballs";
 
   postUnpack = ''
-    mkdir -v $sourceRoot/src
+    mkdir -v $sourceRoot/${tarballPath}
   '' + (lib.flip lib.concatMapStrings srcs.third_party (f: ''
-      ln -sfv ${f} $sourceRoot/src/${f.md5name}
-      ln -sfv ${f} $sourceRoot/src/${f.name}
+      ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
+      ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
     ''))
   + ''
-    ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
-    ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
+    ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
+    ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
+    tar -xf ${srcs.help}
+    tar -xf ${srcs.translations}
   '';
 
   postPatch = ''
@@ -225,6 +231,11 @@ in stdenv.mkDerivation rec {
     # Without these, configure does not finish
     "--without-junit"
 
+    "--disable-libnumbertext" # system-libnumbertext"
+
+    # We do tarball prefetching ourselves
+    "--disable-fetch-external"
+
     # I imagine this helps. Copied from go-oo.
     # Modified on every upgrade, though
     "--disable-odk"
@@ -284,7 +295,7 @@ in stdenv.mkDerivation rec {
   requiredSystemFeatures = [ "big-parallel" ];
 
   meta = with lib; {
-    description = "Comprehensive, professional-quality productivity suite (Still/stable release)";
+    description = "Comprehensive, professional-quality productivity suite (Still/Stable release)";
     homepage = https://libreoffice.org/;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ raskin ];