Loading pkgs/by-name/da/dataexplorer/package.nix +11 −10 Original line number Diff line number Diff line Loading @@ -3,33 +3,34 @@ stdenv, fetchurl, ant, # executable fails to start for jdk > 17 jdk17, openjdk25, swt, makeWrapper, strip-nondeterminism, udevCheckHook, }: let swt-jdk17 = swt.override { jdk = jdk17; }; swt-jdk = swt.override { jdk = openjdk25; }; in stdenv.mkDerivation (finalAttrs: { pname = "dataexplorer"; version = "3.9.3"; version = "4.0.2"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz"; hash = "sha256-NfbhamhRx78MW5H4BpKMDfrV2d082UkaIBFfbemOSOY="; hash = "sha256-HaupE8tCbmlUVMd0ZFt7QwY1AKEx+op21fUeGBpR+UY="; }; nativeBuildInputs = [ ant jdk17 openjdk25 makeWrapper strip-nondeterminism udevCheckHook ]; dontConfigure = true; buildPhase = '' runHook preBuild ant -f build/build.xml dist Loading @@ -49,18 +50,18 @@ stdenv.mkDerivation (finalAttrs: { ant -Dprefix=$out/share/ -f build/build.xml install # Use SWT from nixpkgs ln -sf '${swt-jdk17}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" ln -sf '${swt-jdk}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \ --prefix LD_LIBRARY_PATH : '${swt-jdk17}/lib' \ makeWrapper ${openjdk25}/bin/java $out/bin/DataExplorer \ --prefix LD_LIBRARY_PATH : '${swt-jdk}/lib' \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 makeWrapper ${jdk17}/bin/java $out/bin/DevicePropertiesEditor \ makeWrapper ${openjdk25}/bin/java $out/bin/DevicePropertiesEditor \ --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 Loading Loading
pkgs/by-name/da/dataexplorer/package.nix +11 −10 Original line number Diff line number Diff line Loading @@ -3,33 +3,34 @@ stdenv, fetchurl, ant, # executable fails to start for jdk > 17 jdk17, openjdk25, swt, makeWrapper, strip-nondeterminism, udevCheckHook, }: let swt-jdk17 = swt.override { jdk = jdk17; }; swt-jdk = swt.override { jdk = openjdk25; }; in stdenv.mkDerivation (finalAttrs: { pname = "dataexplorer"; version = "3.9.3"; version = "4.0.2"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz"; hash = "sha256-NfbhamhRx78MW5H4BpKMDfrV2d082UkaIBFfbemOSOY="; hash = "sha256-HaupE8tCbmlUVMd0ZFt7QwY1AKEx+op21fUeGBpR+UY="; }; nativeBuildInputs = [ ant jdk17 openjdk25 makeWrapper strip-nondeterminism udevCheckHook ]; dontConfigure = true; buildPhase = '' runHook preBuild ant -f build/build.xml dist Loading @@ -49,18 +50,18 @@ stdenv.mkDerivation (finalAttrs: { ant -Dprefix=$out/share/ -f build/build.xml install # Use SWT from nixpkgs ln -sf '${swt-jdk17}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" ln -sf '${swt-jdk}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \ --prefix LD_LIBRARY_PATH : '${swt-jdk17}/lib' \ makeWrapper ${openjdk25}/bin/java $out/bin/DataExplorer \ --prefix LD_LIBRARY_PATH : '${swt-jdk}/lib' \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 makeWrapper ${jdk17}/bin/java $out/bin/DevicePropertiesEditor \ makeWrapper ${openjdk25}/bin/java $out/bin/DevicePropertiesEditor \ --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 Loading