From 6464f450d53f8a6f663e9d44e67271bf5d5d9829 Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Wed, 17 Apr 2013 16:35:40 +0200
Subject: [PATCH 1/3] Added Dart SDK M4

---
 .../development/interpreters/dart/default.nix | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/interpreters/dart/default.nix

diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
new file mode 100644
index 00000000000..c9d75b80095
--- /dev/null
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl }:
+ 
+assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "dart-0.4";
+ 
+  installPhase = ''
+    mkdir -p $out
+    cp -R * $out/
+    echo $libPath
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+             --set-rpath $libPath \
+             $out/bin/dart
+    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
+  '';
+  
+  
+  src =
+    if stdenv.system == "x86_64-linux" then
+     fetchurl {
+       url = https://storage.googleapis.com/dart-editor-archive-integration/latest/dartsdk-linux-64.tar.gz;
+       sha256 = "1riwxxczskfsaax7n03m7isnbxf3walky0cac1w8j5apr1xvg5ma";
+      }
+    else
+     fetchurl {
+       url = https://storage.googleapis.com/dart-editor-archive-integration/latest/dartsdk-linux-32.tar.gz;
+       sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6";
+      };
+ 
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc ];
+ 
+  dontStrip = true;
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0525b8e803e..fd8186db589 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9194,4 +9194,8 @@ let
 
   bullet = callPackage ../development/libraries/bullet {};
 
+  dart = import ../development/interpreters/dart {
+    inherit stdenv fetchurl;
+  };
+
 }; in pkgs

From 237192ce6e16f143c7b0c317c08e1f175567ad38 Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Wed, 17 Apr 2013 16:50:02 +0200
Subject: [PATCH 2/3] Adjusted to point to version URL (hosted by me -- had
 to).

---
 pkgs/development/interpreters/dart/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index c9d75b80095..d775b74c903 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
     patchelf --interpreter "$(cat $NIX_GCC/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
@@ -21,14 +23,14 @@ stdenv.mkDerivation {
   
   src =
     if stdenv.system == "x86_64-linux" then
-     fetchurl {
-       url = https://storage.googleapis.com/dart-editor-archive-integration/latest/dartsdk-linux-64.tar.gz;
-       sha256 = "1riwxxczskfsaax7n03m7isnbxf3walky0cac1w8j5apr1xvg5ma";
+      fetchurl {
+        url = http://download.zef.s3.amazonaws.com/dartsdk-m4-linux-64.tar.gz;
+        sha256 = "1riwxxczskfsaax7n03m7isnbxf3walky0cac1w8j5apr1xvg5ma";
       }
     else
-     fetchurl {
-       url = https://storage.googleapis.com/dart-editor-archive-integration/latest/dartsdk-linux-32.tar.gz;
-       sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6";
+      fetchurl {
+        url = http://download.zef.s3.amazonaws.com/dartsdk-m4-linux-32.tar.gz;
+        sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6";
       };
  
   libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc ];

From a5e11c08bb9c8d61288d7b6d6ee968231b670a2e Mon Sep 17 00:00:00 2001
From: Zef Hemel <zef@zef.me>
Date: Wed, 17 Apr 2013 19:38:02 +0200
Subject: [PATCH 3/3] Now using callPackage.

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd8186db589..eac6d002a68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9194,8 +9194,6 @@ let
 
   bullet = callPackage ../development/libraries/bullet {};
 
-  dart = import ../development/interpreters/dart {
-    inherit stdenv fetchurl;
-  };
+  dart = callPackage ../development/interpreters/dart { };
 
 }; in pkgs