mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
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
|
||||
}:
|
||||
|
||||
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
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user