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

Merge pull request #33330 from karolchmist/fix-dotty-lib-folder-public 

dotty: wrap to prevent installing all the files in profile
This commit is contained in:
Yegor Timoshenko 2018-01-08 13:16:20 +00:00 committed by GitHub
parent 563f688059 6c6f620e59
commit d0cfab8346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/development/compilers/scala/dotty-bare.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "0.4.0-RC1";
name = "dotty-bare-${version}";
src = fetchurl {
url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b";
};
propagatedBuildInputs = [ jre ] ;
buildInputs = [ makeWrapper ] ;
installPhase = ''
mkdir -p $out
mv * $out
'';
fixupPhase = ''
bin_files=$(find $out/bin -type f ! -name common)
for f in $bin_files ; do
wrapProgram $f --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.
The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals),
and try to boil down Scala’s types into a smaller set of more fundamental constructs.
The theory behind these constructs is researched in DOT, a calculus for dependent object types.
'';
homepage = http://dotty.epfl.ch/;
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [maintainers.karolchmist];
};
}

52
pkgs/development/compilers/scala/dotty.nix
View File

@ -1,46 +1,22 @@
{ stdenv, fetchurl, makeWrapper, jre }:
{ stdenv, fetchurl, makeWrapper, jre, callPackage }:
stdenv.mkDerivation rec {
version = "0.4.0-RC1";
name = "dotty-${version}";
src = fetchurl {
url = "https://github.com/lampepfl/dotty/releases/download/${version}/${name}.tar.gz";
sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b";
let
dotty-bare = callPackage ./dotty-bare.nix {
inherit stdenv fetchurl makeWrapper jre;
};
in
propagatedBuildInputs = [ jre ] ;
buildInputs = [ makeWrapper ] ;
stdenv.mkDerivation {
name = "dotty-${dotty-bare.version}";
unpackPhase = ":";
installPhase = ''
mkdir -p $out
mv * $out
mkdir -p $out/shared
mv $out/bin/common $out/shared
mkdir -p $out/bin
ln -s ${dotty-bare}/bin/dotc $out/bin/dotc
ln -s ${dotty-bare}/bin/dotd $out/bin/dotd
ln -s ${dotty-bare}/bin/dotr $out/bin/dotr
'';
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.
The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals),
and try to boil down Scala’s types into a smaller set of more fundamental constructs.
The theory behind these constructs is researched in DOT, a calculus for dependent object types.
'';
homepage = http://dotty.epfl.ch/;
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [maintainers.karolchmist];
};
inherit (dotty-bare) meta;
}