summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkuskowa <markus.kowalewski@gmail.com>2023-01-11 10:42:11 +0100
committerGitHub <noreply@github.com>2023-01-11 10:42:11 +0100
commit8e9a5953e5d5e35e26e9907b101194214a3aba27 (patch)
tree282dac151e65dac22cde8790b0622259ef9c1b04
parent9e00bb203130943ea98eb215950bbb42ceeef380 (diff)
parentf4435d546fc6f75d28379620987f381f5f0670ba (diff)
Merge pull request #206326 from NixOS/backport-203304-to-release-22.11
[Backport release-22.11] dataexplorer: 3.6.2 -> 3.7.3
-rw-r--r--pkgs/applications/science/electronics/dataexplorer/default.nix10
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 5745a43df26c..9d06f614870a 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)