diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-18 10:11:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-18 10:11:50 +0200 |
| commit | 8ed485c67b1c98f69e9162b8ff2cdec99a158de8 (patch) | |
| tree | 948373de6b44baa893c08ed9e390027e085c079f /pkgs/applications/science/logic | |
| parent | 9a8f5e539699a39e197a6792524340cc82dce763 (diff) | |
| parent | 40b53a5d0daa4ffbbe5e05a13fc52755d9e5469a (diff) | |
| download | nixpkgs-8ed485c67b1c98f69e9162b8ff2cdec99a158de8.tar nixpkgs-8ed485c67b1c98f69e9162b8ff2cdec99a158de8.tar.gz nixpkgs-8ed485c67b1c98f69e9162b8ff2cdec99a158de8.tar.bz2 nixpkgs-8ed485c67b1c98f69e9162b8ff2cdec99a158de8.tar.lz nixpkgs-8ed485c67b1c98f69e9162b8ff2cdec99a158de8.tar.xz nixpkgs-8ed485c67b1c98f69e9162b8ff2cdec99a158de8.tar.zst nixpkgs-8ed485c67b1c98f69e9162b8ff2cdec99a158de8.zip | |
Merge #65948: tlaplusToolbox: 1.5.7 -> 1.6.0
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/tlaplus/toolbox.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index f1116a27c0b..7d39aae6e3c 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,9 +1,9 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, jre, swt, gtk, libXtst, glib +, gtk, libXtst, glib, zlib }: let - version = "1.5.7"; + version = "1.6.0"; arch = "x86_64"; desktopItem = makeDesktopItem rec { @@ -24,7 +24,7 @@ in stdenv.mkDerivation { name = "tla-toolbox-${version}"; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; + sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm"; }; buildInputs = [ makeWrapper ]; @@ -34,17 +34,20 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" cp -r "$src" "$out/toolbox" - chmod +w "$out/toolbox" "$out/toolbox/toolbox" + chmod -R +w "$out/toolbox" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$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 \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix PATH : "${jre}/bin" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" |