diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-25 18:27:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-25 18:29:21 +0100 |
| commit | f03ca20916cdff74a680bc181d1cc21f23a2ce31 (patch) | |
| tree | 957e2e5ef27661d90c94f8e0a5e47eb4183c69d0 /pkgs/applications/office | |
| parent | cf7ee0337760aaee4ce17be28e43f40335865993 (diff) | |
| download | nixlib-f03ca20916cdff74a680bc181d1cc21f23a2ce31.tar nixlib-f03ca20916cdff74a680bc181d1cc21f23a2ce31.tar.gz nixlib-f03ca20916cdff74a680bc181d1cc21f23a2ce31.tar.bz2 nixlib-f03ca20916cdff74a680bc181d1cc21f23a2ce31.tar.lz nixlib-f03ca20916cdff74a680bc181d1cc21f23a2ce31.tar.xz nixlib-f03ca20916cdff74a680bc181d1cc21f23a2ce31.tar.zst nixlib-f03ca20916cdff74a680bc181d1cc21f23a2ce31.zip | |
libreoffice: Fix path to the JDK
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fd93bda4c96a..67cbd7996ffc 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -54,7 +54,7 @@ let buildInputs = [ libtool pkgconfig libxml2 ]; }; - + # doesn't work with srcs versioning libmspub = stdenv.mkDerivation rec { version = "0.0.6"; @@ -66,8 +66,8 @@ let }; configureFlags = "--disable-werror"; - - buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ]; + + buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ]; }; # doesn't exist in srcs @@ -82,7 +82,7 @@ let configureFlags = "--with-boost=${boost}"; - buildInputs = [ boost mdds pkgconfig ]; + buildInputs = [ boost mdds pkgconfig ]; }; fetchThirdParty = {name, md5}: fetchurl { @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { "--disable-kde" "--disable-postgresql-sdbc" "--with-package-format=native" - "--with-jdk-home=${jdk}" + "--with-jdk-home=${jdk}/lib/openjdk" "--with-ant-home=${ant}/lib/ant" "--without-afms" "--without-fonts" |