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

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
This commit is contained in:
Badi Abdul-Wahid 2019-08-04 09:27:13 -05:00
parent 33a58b36e2
commit 40b53a5d0d
No known key found for this signature in database
GPG Key ID: 5C02A763FA1FF588
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/science/logic/tlaplus/toolbox.nix
View File

@ -1,9 +1,9 @@
{ lib, fetchzip, makeWrapper, makeDesktopItem, stdenv { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv
, jre, swt, gtk, libXtst, glib , gtk, libXtst, glib, zlib
}: }:
let let
version = "1.5.7"; version = "1.6.0";
arch = "x86_64"; arch = "x86_64";
desktopItem = makeDesktopItem rec { desktopItem = makeDesktopItem rec {
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
name = "tla-toolbox-${version}"; name = "tla-toolbox-${version}";
src = fetchzip { src = fetchzip {
url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -34,17 +34,20 @@ in stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
cp -r "$src" "$out/toolbox" cp -r "$src" "$out/toolbox"
chmod +w "$out/toolbox" "$out/toolbox/toolbox" chmod -R +w "$out/toolbox"
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/toolbox/toolbox" "$out/toolbox/toolbox"
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$(find "$out/toolbox" -name java)"
makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
--run "set -x; cd $out/toolbox" \ --run "set -x; cd $out/toolbox" \
--add-flags "-data ~/.tla-toolbox" \ --add-flags "-data ~/.tla-toolbox" \
--prefix PATH : "${jre}/bin" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}"
echo -e "\nCreating TLA Toolbox icons..." echo -e "\nCreating TLA Toolbox icons..."
pushd "$src" pushd "$src"