From e8c8163f336edd0f19c4d9e64d7e415591ec34d2 Mon Sep 17 00:00:00 2001
From: Karol Chmist <karol@chmist.com>
Date: Mon, 13 Nov 2017 09:15:43 +0100
Subject: [PATCH] [CodeReview] Added suggestions by yegortimoshenko

---
 lib/maintainers.nix                        |  1 +
 pkgs/development/compilers/scala/dotty.nix | 29 ++++++++++++----------
 pkgs/top-level/all-packages.nix            |  3 ++-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3f95e7638ac..97bbbdceaba 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -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>";
diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix
index cc02c7534f4..cb0c4355002 100644
--- a/pkgs/development/compilers/scala/dotty.nix
+++ b/pkgs/development/compilers/scala/dotty.nix
@@ -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];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7af3e99bd2e..1f70d569584 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };