Commit 60c783c0 authored by Rolf Schröder's avatar Rolf Schröder
Browse files

geoserver: disable libjpeg-turbo extension because of java issues

parent 246a3b97

nixos/tests/geoserver.nix

+3 −1
Original line number Diff line number Diff line
@@ -76,9 +76,11 @@ in 
      _, stdout = machine.execute(f"cat {log_file}")

      print(stdout.replace("\\n", "\n"))

      assert "GDAL Native Library loaded" in stdout, "gdal"

      assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo"

      assert "org.geotools.imageio.netcdf.utilities.NetCDFUtilities" in stdout, "netcdf"

      assert "Unable to load library 'netcdf'" not in stdout, "netcdf"



      # libjpeg-turbo is disabled as of 2.28.1.

      # assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo"



  '';

}

pkgs/by-name/ge/geoserver/extensions.nix

+9 −6
Original line number Diff line number Diff line
@@ -197,12 +197,15 @@ in 
  #  hash = "sha256-sLUgsMXymnTuceCRLzqIAPmk4/Q3BO+A+7BLQoc3iP0="; # jp2k

  #};



  libjpeg-turbo = mkGeoserverExtension {

    name = "libjpeg-turbo";

    version = "2.28.1"; # libjpeg-turbo

    hash = "sha256-fn1ItYvLMfvRLpCE8rEpTpBmkk8zkN3QtBO/RN4RXfo="; # libjpeg-turbo

    buildInputs = [ libjpeg.out ];

  };

  # Throws "java.lang.UnsatisfiedLinkError: 'void org.libjpegturbo.turbojpeg.TJDecompressor.init()'"

  # as of 2.28.1.

  # NOTE: When re-enabling this, RE-ENABLE THE CORRESPONDING TEST, TOO! (See tests/geoserver.nix)

  #libjpeg-turbo = mkGeoserverExtension {

  #  name = "libjpeg-turbo";

  #  version = "2.28.1"; # libjpeg-turbo

  #  hash = "sha256-fn1ItYvLMfvRLpCE8rEpTpBmkk8zkN3QtBO/RN4RXfo="; # libjpeg-turbo

  #  buildInputs = [ libjpeg.out ];

  #};



  mapml = mkGeoserverExtension {

    name = "mapml";