1 files changed, 35 insertions, 25 deletions
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index dd0d0e94482c..d32f415732b9 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -1,39 +1,49 @@
-{ stdenv, fetchurl }:
- 
-assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+{ stdenv, fetchurl, unzip }:
 
+let
+  version = "1.16.1";
+in
 stdenv.mkDerivation {
-  name = "dart-0.4";
- 
-  installPhase = ''
-    mkdir -p $out
-    cp -R * $out/
-    echo $libPath
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-             --set-rpath $libPath \
-             $out/bin/dart
-    
-    # Hack around weird dart2js resolving bug
-    mv $out/bin/dart2js $out/bin/.dart2js
-    echo "#!/bin/sh" > $out/bin/dart2js
-    echo "$out/bin/.dart2js \$*" >> $out/bin/dart2js
-    chmod +x $out/bin/dart2js
-  '';
-  
+  name = "dart-${version}";
+
+  nativeBuildInputs = [
+    unzip
+  ];
   
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = http://download.zef.s3.amazonaws.com/dartsdk-m4-linux-64.tar.gz;
-        sha256 = "1riwxxczskfsaax7n03m7isnbxf3walky0cac1w8j5apr1xvg5ma";
+        url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
+        sha256 = "01cbnc8hd2wwprmivppmzvld9ps644k16wpgqv31h1596l5p82n2";
       }
     else
       fetchurl {
-        url = http://download.zef.s3.amazonaws.com/dartsdk-m4-linux-32.tar.gz;
-        sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6";
+        url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
+        sha256 = "0jfwzc3jbk4n5j9ka59s9bkb25l5g85fl1nf676mvj36swcfykx3";
       };
- 
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R * $out/
+    echo $libPath
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+             --set-rpath $libPath \
+             $out/bin/dart
+  '';
+
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
  
   dontStrip = true;
+  
+  meta = {
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    homepage = "https://www.dartlang.org/";
+    description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
+    longDescription = ''
+      Dart is a class-based, single inheritance, object-oriented language
+      with C-style syntax. It offers compilation to JavaScript, interfaces,
+      mixins, abstract classes, reified generics, and optional typing.
+    '';
+    license = stdenv.lib.licenses.bsd3;
+  };
 }