pyrox.dev
tunnelx: minor refactor and cleanup
Follow up of https://github.com/NixOS/nixpkgs/pull/239739
+15
-12
pkgs/applications/gis/tunnelx/default.nix
+15
-12
pkgs/applications/gis/tunnelx/default.nix
···
19
19
};
20
20
21
21
nativeBuildInputs = [
22
-
makeWrapper
23
-
];
24
-
25
-
buildInputs = [
26
22
jdk
27
-
];
28
-
29
-
runtimeInputs = [
30
-
survex
23
+
makeWrapper
31
24
];
32
25
33
26
buildPhase = ''
27
+
runHook preBuild
28
+
34
29
javac -d . src/*.java
30
+
31
+
runHook postBuild
35
32
'';
36
33
37
34
installPhase = ''
35
+
runHook preInstall
36
+
38
37
mkdir -p $out/bin $out/java
39
38
cp -r symbols Tunnel tutorials $out/java
39
+
# `SURVEX_EXECUTABLE_DIR` must include trailing slash
40
40
makeWrapper ${jre}/bin/java $out/bin/tunnelx \
41
41
--add-flags "-cp $out/java Tunnel.MainBox" \
42
-
--set SURVEX_EXECUTABLE_DIR ${survex}/bin/ \
42
+
--set SURVEX_EXECUTABLE_DIR ${lib.getBin survex}/bin/ \
43
43
--set TUNNEL_USER_DIR $out/java/
44
+
45
+
runHook postInstall
44
46
'';
45
47
46
-
meta = with lib; {
48
+
meta = {
47
49
description = "A program for drawing cave surveys in 2D";
48
50
homepage = "https://github.com/CaveSurveying/tunnelx/";
49
-
license = licenses.gpl3;
50
-
maintainers = with maintainers; [ goatchurchprime ];
51
+
license = lib.licenses.gpl3;
52
+
maintainers = with lib.maintainers; [ goatchurchprime ];
53
+
platforms = lib.platforms.linux;
51
54
};
52
55
})