diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/applications/office/openoffice/builder.sh | |
parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
download | nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/applications/office/openoffice/builder.sh')
-rw-r--r-- | pkgs/applications/office/openoffice/builder.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 7e61505a63c..848afe96210 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -10,6 +10,8 @@ postUnpack() { } preConfigure() { + ./configure --help + for i in sysui/desktop/share/makefile.mk; do substituteInPlace $i --replace /bin/bash $shell done |