tlaplus: move to by-name
This commit is contained in:
+6
-5
@@ -3,7 +3,8 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
jre,
|
||||
# TODO: switch to jre https://github.com/NixOS/nixpkgs/pull/89731
|
||||
jre8,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -22,13 +23,13 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/share/java $out/bin
|
||||
cp $src $out/share/java/tla2tools.jar
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/tlc \
|
||||
makeWrapper ${jre8}/bin/java $out/bin/tlc \
|
||||
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC"
|
||||
makeWrapper ${jre}/bin/java $out/bin/tlasany \
|
||||
makeWrapper ${jre8}/bin/java $out/bin/tlasany \
|
||||
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY"
|
||||
makeWrapper ${jre}/bin/java $out/bin/pcal \
|
||||
makeWrapper ${jre8}/bin/java $out/bin/pcal \
|
||||
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans"
|
||||
makeWrapper ${jre}/bin/java $out/bin/tlatex \
|
||||
makeWrapper ${jre8}/bin/java $out/bin/tlatex \
|
||||
--add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA"
|
||||
'';
|
||||
|
||||
@@ -15109,9 +15109,6 @@ with pkgs;
|
||||
gmp-static = gmp.override { withStatic = true; };
|
||||
};
|
||||
|
||||
tlaplus = callPackage ../applications/science/logic/tlaplus {
|
||||
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
|
||||
inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user