nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208646 from panicgh/dataexplorer-pin-jdk17

Browse Source 
dataexplorer: pin jdk17
This commit is contained in:
Bobby Rong 2023-01-02 18:28:43 +08:00 committed by GitHub
commit 9c4971292f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/science/electronics/dataexplorer/default.nix
View File

@ -2,7 +2,6 @@
, stdenv
, fetchurl
, jdk
, jre
, ant
, makeWrapper
}:
@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
# 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 ${jre}/bin/java $out/bin/DataExplorer \
makeWrapper ${jdk}/bin/java $out/bin/DataExplorer \
--add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \
--set SWT_GTK3 0
makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \
makeWrapper ${jdk}/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

5
pkgs/top-level/all-packages.nix
View File

@ -36324,7 +36324,10 @@ with pkgs;
csxcad = callPackage ../applications/science/electronics/csxcad { };
dataexplorer = callPackage ../applications/science/electronics/dataexplorer { };
dataexplorer = callPackage ../applications/science/electronics/dataexplorer {
# executable fails at startup for jdk > 17
jdk = jdk17;
};
diylc = callPackage ../applications/science/electronics/diylc { };