Fix for an early build failure of libreoffice. Enabling it for hydra to see if it builds further.
svn path=/nixpkgs/trunk/; revision=33026
This commit is contained in:
parent
bdcce09b46
commit
1b7e6447f9
@ -10,10 +10,11 @@
|
|||||||
, force ? false
|
, force ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
if !force then
|
# ** Checking with hydra if it builds totally **
|
||||||
throw ''The expression for libreoffice is still not ready.
|
#if !force then
|
||||||
Set config.libreoffice.force = true; if you want to try it anyway.''
|
# throw ''The expression for libreoffice is still not ready.
|
||||||
else
|
# Set config.libreoffice.force = true; if you want to try it anyway.''
|
||||||
|
#else
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libreoffice-3.5.0.3";
|
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 \
|
sed -i 's,/usr/bin/env bash,${bash}/bin/bash,' bin/unpack-sources \
|
||||||
solenv/bin/install-gdb-printers solenv/bin/striplanguagetags.sh
|
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
|
# Needed to find genccode
|
||||||
PATH=$PATH:${icu}/sbin
|
PATH=$PATH:${icu}/sbin
|
||||||
'';
|
'';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user