diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-16 09:18:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-16 09:18:07 +0000 |
| commit | 2e81976a3441967a630d60891cb1fe15f499aab8 (patch) | |
| tree | fe8122d892480f0eb3fbda6acb7934360e9c5e86 /pkgs | |
| parent | 4ac97e16b639560fa925d55575eb34efa9916047 (diff) | |
| download | nixlib-2e81976a3441967a630d60891cb1fe15f499aab8.tar nixlib-2e81976a3441967a630d60891cb1fe15f499aab8.tar.gz nixlib-2e81976a3441967a630d60891cb1fe15f499aab8.tar.bz2 nixlib-2e81976a3441967a630d60891cb1fe15f499aab8.tar.lz nixlib-2e81976a3441967a630d60891cb1fe15f499aab8.tar.xz nixlib-2e81976a3441967a630d60891cb1fe15f499aab8.tar.zst nixlib-2e81976a3441967a630d60891cb1fe15f499aab8.zip | |
* Apply xlib.patch to go-oo as well.
svn path=/nixpkgs/branches/x-updates/; revision=25985
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/openoffice/go-oo.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index 35e39ff1cc79..241c2ff2a130 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { done sed '/-x $WGET/d' -i download ./download + # Needed to find genccode PATH=$PATH:${icu}/sbin @@ -53,6 +54,9 @@ stdenv.mkDerivation rec { set -x pushd build/${tag} + + patch -p1 < ${./xlib.patch} + # Fix svtools: hardcoded jpeg path sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk # Fix sysui: wants to create a tar for root @@ -64,6 +68,7 @@ stdenv.mkDerivation rec { # Fix redland: wants to set rpath to /usr/local/lib sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \ redland/raptor/makefile.mk redland/rasqal/makefile.mk + popd set +x |