1 files changed, 15 insertions, 19 deletions
diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix
index 31a7dcd1f561..cec1619f32ef 100644
--- a/pkgs/applications/networking/pond/default.nix
+++ b/pkgs/applications/networking/pond/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, lib, fetchgit, fetchhg, go_1_3, trousers }:
+{ lib, goPackages, fetchgit, trousers }:
 
-let deps = import ./deps.nix {
-  inherit stdenv lib fetchgit fetchhg;
-};
+with goPackages;
 
-in stdenv.mkDerivation rec {
-  name = "pond";
-
-  buildInputs  = [ go_1_3 trousers ];
+buildGoPackage rec {
+  rev = "f4e441c77a2039814046ff8219629c547fe8b689";
+  name = "pond-${lib.strings.substring 0 7 rev}";
+  goPackagePath = "github.com/agl/pond";
+  src = fetchgit {
+    inherit rev;
+    url = "git://github.com/agl/pond.git";
+    sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026";
+  };
 
-  unpackPhase = ''
-    export GOPATH=$PWD
-    echo $PWD
-    cp -LR ${deps}/src src
-    chmod u+w -R src
-  '';
+  subPackages = [ "client" ];
 
-  installPhase = ''
-    export GOPATH="$PWD"
-    mkdir -p $out/bin
-    go build --tags nogui -v -o $out/bin/pond-cli github.com/agl/pond/client
-  '';
+  buildInputs = [ trousers net crypto protobuf ed25519 ];
+    
+  makeFlags = "--tags nogui";
 
   meta = with lib; {
     description = "Forward secure, asynchronous messaging for the discerning";