nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix the build of openoffice 3.2.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=21880
This commit is contained in:
Lluís Batlle i Rossell 2010-05-19 16:46:48 +00:00
parent e283f86174
commit 0ff12ea30b
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/openoffice/builder.sh
View File

@ -33,7 +33,8 @@ postConfigure() {
buildPhase() { buildPhase() {
source LinuxX86*Env.Set.sh source LinuxX86*Env.Set.sh
./bootstrap ./bootstrap
dmake # wait a few hours... # bootstrap defines the alias 'build', that mostly runs this perl script:
(cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores
} }
wrapSOffice() { wrapSOffice() {
@ -57,6 +58,7 @@ installPhase() {
ooFiles=$out/lib/openoffice ooFiles=$out/lib/openoffice
# This was all borrowed from ooo-build-2.2.1's bin/ooinstall. # This was all borrowed from ooo-build-2.2.1's bin/ooinstall.
# This needs the ./bootstrap having run in the buildPhase to get some env vars.
eval $(grep 'BUILD\|LAST_MINOR' $SOLARENV/inc/minor.mk) eval $(grep 'BUILD\|LAST_MINOR' $SOLARENV/inc/minor.mk)
export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH
export OUT=../$INPATH export OUT=../$INPATH

5
pkgs/applications/office/openoffice/default.nix
View File

@ -67,11 +67,6 @@ stdenv.mkDerivation rec {
--without-system-graphite --without-system-graphite
"; ";
# Double make - I don't know why a single make reports error, and two, do not.
buildPhase = ''
make || make
'';
LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
buildInputs = [ buildInputs = [