libreoffice: trying to make it build with openjdk

2012-08-24 09:20:27 +02:00 · 2012-08-24 09:20:27 +02:00 · 87a3bcd470
commit 87a3bcd470
parent dbe524fe3f
2 changed files with 3 additions and 0 deletions
--- 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 = [
--- 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