[CodeReview] Added suggestions by yegortimoshenko
This commit is contained in:
parent
da94de1a20
commit
e8c8163f33
|
@ -325,6 +325,7 @@
|
|||
kaiha = "Kai Harries <kai.harries@gmail.com>";
|
||||
kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
|
||||
kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
|
||||
karolchmist = "karolchmist <info+nix@chmist.com>";
|
||||
kentjames = "James Kent <jameschristopherkent@gmail.com";
|
||||
kevincox = "Kevin Cox <kevincox@kevincox.ca>";
|
||||
khumba = "Bryan Gardiner <bog@khumba.net>";
|
||||
|
|
|
@ -16,19 +16,21 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out
|
||||
mv * $out
|
||||
|
||||
for p in $out/bin/* ; do
|
||||
file=$(basename $p)
|
||||
|
||||
# no need to wrap common
|
||||
if [[ "$file" = "common" ]] ; then
|
||||
continue
|
||||
fi
|
||||
|
||||
wrapProgram $p --set JAVA_HOME ${jre}
|
||||
done
|
||||
mkdir -p $out/shared
|
||||
mv $out/bin/common $out/shared
|
||||
'';
|
||||
|
||||
meta = {
|
||||
fixupPhase = ''
|
||||
for file in $out/bin/* ; do
|
||||
substituteInPlace $file \
|
||||
--replace '$PROG_HOME/bin/common' $out/shared/common
|
||||
|
||||
wrapProgram $file \
|
||||
--set JAVA_HOME ${jre}
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Research platform for new language concepts and compiler technologies for Scala.";
|
||||
longDescription = ''
|
||||
Dotty is a platform to try out new language concepts and compiler technologies for Scala.
|
||||
|
@ -37,7 +39,8 @@ stdenv.mkDerivation rec {
|
|||
The theory behind these constructs is researched in DOT, a calculus for dependent object types.
|
||||
'';
|
||||
homepage = http://dotty.epfl.ch/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [maintainers.karolchmist];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5479,6 +5479,8 @@ with pkgs;
|
|||
|
||||
devpi-client = callPackage ../development/tools/devpi-client {};
|
||||
|
||||
dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;};
|
||||
|
||||
drumstick = callPackage ../development/libraries/drumstick { };
|
||||
|
||||
ecl = callPackage ../development/compilers/ecl { };
|
||||
|
@ -6264,7 +6266,6 @@ with pkgs;
|
|||
scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
|
||||
scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { };
|
||||
scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; };
|
||||
scala_dotty = callPackage ../development/compilers/scala/dotty.nix { jre = jre8;};
|
||||
scala = scala_2_12;
|
||||
|
||||
scalafmt = callPackage ../development/tools/scalafmt { };
|
||||
|
|
Loading…
Reference in a new issue