colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #297189 from TomaSajt/dataexplorer

Browse Source 
dataexplorer: make deterministic and clean up
This commit is contained in:
Pol Dellaiera 2024-03-25 11:16:06 +01:00 committed by GitHub
commit e74650c878
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,26 +1,32 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, jdk
, ant , ant
, jdk
, makeWrapper , makeWrapper
, strip-nondeterminism
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "dataexplorer"; pname = "dataexplorer";
version = "3.8.5"; version = "3.8.5";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ="; hash = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ=";
}; };
nativeBuildInputs = [ ant makeWrapper ]; nativeBuildInputs = [
ant
buildInputs = [ jdk ]; jdk
makeWrapper
strip-nondeterminism
];
buildPhase = '' buildPhase = ''
runHook preBuild
ant -f build/build.xml dist ant -f build/build.xml dist
runHook postBuild
''; '';
doCheck = false; doCheck = false;
@ -30,6 +36,8 @@ stdenv.mkDerivation rec {
#''; #'';
installPhase = '' installPhase = ''
runHook preInstall
ant -Dprefix=$out/share/ -f build/build.xml install ant -Dprefix=$out/share/ -f build/build.xml install
# The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer
@ -49,6 +57,14 @@ stdenv.mkDerivation rec {
$out/etc/udev/rules.d/50-Junsi-iCharger-USB.rules $out/etc/udev/rules.d/50-Junsi-iCharger-USB.rules
install -Dvm644 build/misc/GNU_LINUX_SKYRC_UDEV_RULE/50-SkyRC-Charger.rules \ install -Dvm644 build/misc/GNU_LINUX_SKYRC_UDEV_RULE/50-SkyRC-Charger.rules \
$out/etc/udev/rules.d/50-SkyRC-Charger.rules $out/etc/udev/rules.d/50-SkyRC-Charger.rules
runHook postInstall
'';
# manually call strip-nondeterminism because using stripJavaArchivesHook takes
# too long to strip bundled jars
postFixup = ''
strip-nondeterminism --type jar $out/share/DataExplorer/{DataExplorer.jar,devices/*.jar}
''; '';
meta = with lib; { meta = with lib; {
@ -63,4 +79,4 @@ stdenv.mkDerivation rec {
binaryBytecode # contains thirdparty jar files, e.g. javax.json, org.glassfish.json binaryBytecode # contains thirdparty jar files, e.g. javax.json, org.glassfish.json
]; ];
}; };
} })