Author: eelco
Date: Wed Feb 16 09:18:07 2011
New Revision: 25985
URL: https://svn.nixos.org/websvn/nix/?rev=25985&sc=1
Log:
* Apply xlib.patch to go-oo as well.
Modified:
nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/go-oo.nix
Modified:
nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/go-oo.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/go-oo.nix
Wed Feb 16 00:48:58 2011 (r25984)
+++ nixpkgs/branches/x-updates/pkgs/applications/office/openoffice/go-oo.nix
Wed Feb 16 09:18:07 2011 (r25985)
@@ -46,6 +46,7 @@
done
sed '/-x $WGET/d' -i download
./download
+
# Needed to find genccode
PATH=$PATH:${icu}/sbin
@@ -53,6 +54,9 @@
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 @@
# 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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
