public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libreoffice: Fix path to the JDK

Browse Source
This commit is contained in:
Eelco Dolstra 2014-01-25 18:27:53 +01:00
parent cf7ee03377
commit f03ca20916
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/office/libreoffice/default.nix
View File

@ -54,7 +54,7 @@ let
buildInputs = [ libtool pkgconfig libxml2 ]; buildInputs = [ libtool pkgconfig libxml2 ];
}; };
# doesn't work with srcs versioning # doesn't work with srcs versioning
libmspub = stdenv.mkDerivation rec { libmspub = stdenv.mkDerivation rec {
version = "0.0.6"; version = "0.0.6";
@ -66,8 +66,8 @@ let
}; };
configureFlags = "--disable-werror"; configureFlags = "--disable-werror";
buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ]; buildInputs = [ zlib libwpd libwpg pkgconfig boost icu ];
}; };
# doesn't exist in srcs # doesn't exist in srcs
@ -82,7 +82,7 @@ let
configureFlags = "--with-boost=${boost}"; configureFlags = "--with-boost=${boost}";
buildInputs = [ boost mdds pkgconfig ]; buildInputs = [ boost mdds pkgconfig ];
}; };
fetchThirdParty = {name, md5}: fetchurl { fetchThirdParty = {name, md5}: fetchurl {
@ -224,7 +224,7 @@ stdenv.mkDerivation rec {
"--disable-kde" "--disable-kde"
"--disable-postgresql-sdbc" "--disable-postgresql-sdbc"
"--with-package-format=native" "--with-package-format=native"
"--with-jdk-home=${jdk}" "--with-jdk-home=${jdk}/lib/openjdk"
"--with-ant-home=${ant}/lib/ant" "--with-ant-home=${ant}/lib/ant"
"--without-afms" "--without-afms"
"--without-fonts" "--without-fonts"