git.iko.soy/typeable/nixpkgs
on master help sign in
tla+ toolbox: 1.5.7 -> 1.6.0

Bumps to new release of TLA+ Toolbox. Main change: - toolbox now includes JRE so those external dependencies are no longer needed. Testing: - nix-build -A tlaplusToolbox - ./result/bin/tla-toolbox - pdf generation - validation of a simple pluscal model

commit40b53a5d0daa4ffbbe5e05a13fc52755d9e5469a authorBadi Abdul-Wahid <abdulwahidc@gmail.com> dateSun 4 Aug 2019, 09:27 (7 years ago) parent33a58b3
1 file changed+9−6
pkgs/applications/science/logic/tlaplus/toolbox.nix+9−6
pkgs/applications/science/logic/tlaplus/toolbox.nix+9−6
@@ -1,9 +1,9 @@
11{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv
2−, jre, swt, gtk, libXtst, glib
2+, gtk, libXtst, glib, zlib
33}:
44
55let
6− version = "1.5.7";
6+ version = "1.6.0";
77 arch = "x86_64";
88
99 desktopItem = makeDesktopItem rec {
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
2424 name = "tla-toolbox-${version}";
2525 src = fetchzip {
2626 url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
27− sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q";
27+ sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm";
2828 };
2929
3030 buildInputs = [ makeWrapper ];
@@ -34,17 +34,20 @@ in stdenv.mkDerivation {
3434 installPhase = ''
3535 mkdir -p "$out/bin"
3636 cp -r "$src" "$out/toolbox"
37− chmod +w "$out/toolbox" "$out/toolbox/toolbox"
37+ chmod -R +w "$out/toolbox"
3838
3939 patchelf \
4040 --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
4141 "$out/toolbox/toolbox"
4242
43+ patchelf \
44+ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
45+ "$(find "$out/toolbox" -name java)"
46+
4347 makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
4448 --run "set -x; cd $out/toolbox" \
4549 --add-flags "-data ~/.tla-toolbox" \
46− --prefix PATH : "${jre}/bin" \
47− --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}"
50+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}"
4851
4952 echo -e "\nCreating TLA Toolbox icons..."
5053 pushd "$src"