diff options
| author | Nicolas Benes <nbenes.gh@xandea.de> | 2022-11-27 14:52:23 +0100 |
|---|---|---|
| committer | Nicolas Benes <nbenes.gh@xandea.de> | 2022-12-15 13:23:30 +0100 |
| commit | 4cbba917e0df63e03be4b1f41ae1221f95856c0b (patch) | |
| tree | 6ef4b2c22d9a07e1176a24fb3363f25afb48c37b /pkgs/applications/science/electronics/dataexplorer | |
| parent | dd92dda30dc5e1a378cc157c4cc436a74f70aa95 (diff) | |
dataexplorer: 3.6.2 -> 3.7.3
In v3.7.1, the `file.encoding=UTF-8` setting has been moved into the application itself. It is not needed any more to pass it via the `java` command line. The program builds incorrectly for non-x86_64-linux platforms, although they should be supported. Until the issue is understood and can be fixed, declare support for only the x86_64-linux platform.
Diffstat (limited to 'pkgs/applications/science/electronics/dataexplorer')
| -rw-r--r-- | pkgs/applications/science/electronics/dataexplorer/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 5745a43df26c6..9d06f614870aa 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.6.2"; + version = "3.7.3"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-2e8qeoJh7z/RIowMtAd8PGcMPck5H8iHqel6bW7EQ0E="; + sha256 = "sha256-cqvlPV4i9m0x3hbruC5y2APsyjfI5y9RT8XVzsDaT/Q="; }; nativeBuildInputs = [ ant makeWrapper ]; @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ - --add-flags "-Dfile.encoding=UTF-8 -Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ + --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ - --add-flags "-Dfile.encoding=UTF-8 -Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ + --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/dataexplorer/index.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ panicgh ]; - platforms = jdk.meta.platforms; + platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ fromSource binaryNativeCode # contains RXTXcomm (JNI library with *.so files) |