From 1b7e6447f9e84f60b718019a17d175fa51c0c6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Mon, 12 Mar 2012 21:38:00 +0000
Subject: [PATCH] Fix for an early build failure of libreoffice. Enabling it
for hydra to see if it builds further.
svn path=/nixpkgs/trunk/; revision=33026
---
pkgs/applications/office/openoffice/libreoffice.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index 85c23316695..37093c959a7 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -10,10 +10,11 @@
, force ? false
}:
-if !force then
- throw ''The expression for libreoffice is still not ready.
- Set config.libreoffice.force = true; if you want to try it anyway.''
-else
+# ** Checking with hydra if it builds totally **
+#if !force then
+# throw ''The expression for libreoffice is still not ready.
+# Set config.libreoffice.force = true; if you want to try it anyway.''
+#else
stdenv.mkDerivation rec {
name = "libreoffice-3.5.0.3";
@@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' bin/unpack-sources \
solenv/bin/install-gdb-printers solenv/bin/striplanguagetags.sh
+ sed -i 's,/usr/bin/env perl,${perl}/bin/perl,' solenv/bin/concat-deps.pl
+
# Needed to find genccode
PATH=$PATH:${icu}/sbin
'';