diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-19 16:46:48 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-19 16:46:48 +0000 |
| commit | 0ff12ea30bed2dac13bdc4b7fef3f50925afe5de (patch) | |
| tree | 3e51bb9791fa4476709c66259e0ea25fa3cca49e | |
| parent | e283f861746bdaba44e4f58478ba2a5b1e3257e4 (diff) | |
| download | nixlib-0ff12ea30bed2dac13bdc4b7fef3f50925afe5de.tar nixlib-0ff12ea30bed2dac13bdc4b7fef3f50925afe5de.tar.gz nixlib-0ff12ea30bed2dac13bdc4b7fef3f50925afe5de.tar.bz2 nixlib-0ff12ea30bed2dac13bdc4b7fef3f50925afe5de.tar.lz nixlib-0ff12ea30bed2dac13bdc4b7fef3f50925afe5de.tar.xz nixlib-0ff12ea30bed2dac13bdc4b7fef3f50925afe5de.tar.zst nixlib-0ff12ea30bed2dac13bdc4b7fef3f50925afe5de.zip | |
Trying to fix the build of openoffice 3.2.0
svn path=/nixpkgs/trunk/; revision=21880
| -rw-r--r-- | pkgs/applications/office/openoffice/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/openoffice/default.nix | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 848afe962109..131e85de5bf6 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -33,7 +33,8 @@ postConfigure() { buildPhase() { source LinuxX86*Env.Set.sh ./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() { @@ -57,6 +58,7 @@ installPhase() { ooFiles=$out/lib/openoffice # 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) export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH export OUT=../$INPATH diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 5c1e34a4425c..9c8b7cdb3626 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -67,11 +67,6 @@ stdenv.mkDerivation rec { --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"; buildInputs = [ |