diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-24 09:20:27 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-08-24 09:20:53 +0200 |
| commit | 87a3bcd4706c9d6b449cf6390d36a6265069019d (patch) | |
| tree | a89e5378f110302b7968373e6ba76045ec9a0177 /pkgs | |
| parent | dbe524fe3f1ccb0765d273e056a8ec3dd5c40e49 (diff) | |
| download | nixlib-87a3bcd4706c9d6b449cf6390d36a6265069019d.tar nixlib-87a3bcd4706c9d6b449cf6390d36a6265069019d.tar.gz nixlib-87a3bcd4706c9d6b449cf6390d36a6265069019d.tar.bz2 nixlib-87a3bcd4706c9d6b449cf6390d36a6265069019d.tar.lz nixlib-87a3bcd4706c9d6b449cf6390d36a6265069019d.tar.xz nixlib-87a3bcd4706c9d6b449cf6390d36a6265069019d.tar.zst nixlib-87a3bcd4706c9d6b449cf6390d36a6265069019d.zip | |
libreoffice: trying to make it build with openjdk
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/openoffice/libreoffice.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index fb577be03907..da786c23c33e 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -144,6 +144,8 @@ stdenv.mkDerivation rec { "--without-system-nss" "--without-system-sampleicc" "--without-system-libexttextcat" + + "--with-java-target-version=1.6" # The default 1.7 not supported ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ee6dc66b2d6..aaeaf48d2128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7170,6 +7170,7 @@ let inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; boost = boost149; + jdk = openjdk; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf |