From 96716749593c0a240422fea27268680e5522246a Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek.gonyeo@coreos.com>
Date: Tue, 22 Dec 2015 15:31:00 -0800
Subject: [PATCH] acbuild: 0.1.1 -> 0.2.2 and moved to own default.nix, fixes
 #11889

---
 lib/maintainers.nix                        |  1 +
 pkgs/applications/misc/acbuild/default.nix | 37 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 pkgs/top-level/go-packages.nix             | 20 ------------
 4 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/applications/misc/acbuild/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e19970fe9144..3e681c673510 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -81,6 +81,7 @@
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
   dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>";
+  dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   dochang = "Desmond O. Chang <dochang@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix
new file mode 100644
index 000000000000..3c8f4f335f26
--- /dev/null
+++ b/pkgs/applications/misc/acbuild/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, go, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "acbuild-${version}";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "appc";
+    repo = "acbuild";
+    rev = "v${version}";
+    sha256 = "0sajmjg655irwy5fywk88cmwhc1q186dg5w8589pab2jhwpavdx4";
+  };
+
+  buildInputs = [ go ];
+
+  patchPhase = ''
+    sed -i -e 's|\$(git describe --dirty)|"${version}"|' build
+  '';
+
+  buildPhase = ''
+    patchShebangs build
+    ./build
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv bin $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A build tool for ACIs";
+    homepage = https://github.com/appc/acbuild;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dgonyeo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1b778a95cb3..1b1149654e59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -482,6 +482,8 @@ let
 
   abduco = callPackage ../tools/misc/abduco { };
 
+  acbuild = callPackage ../applications/misc/acbuild { };
+
   acct = callPackage ../tools/system/acct { };
 
   acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 776558b126fe..8357971d0f95 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3218,26 +3218,6 @@ let
     sha256 = "0zc1ah5cvaqa3zw0ska89a40x445vwl1ixz8v42xi3zicx16ibwz";
   };
 
-  acbuild = stdenv.mkDerivation rec {
-    version = "0.1.1";
-    name = "acbuild-${version}";
-    src = fetchFromGitHub {
-      rev    = "beae3971de6b2c35807a98ef1d0fa3167cc3a4a8";
-      owner  = "appc";
-      repo   = "acbuild";
-      sha256 = "1mjmg2xj190dypp2yqslrx8xhwcyrrz38xxp0rig4fr60i2qy41j";
-    };
-    buildInputs = [ go ];
-    patchPhase = ''
-      sed -i -e 's|\$(git describe --dirty)|"${version}"|' build
-      sed -i -e 's|\$GOBIN/acbuild|$out/bin/acbuild|' build
-    '';
-    installPhase = ''
-      mkdir -p $out/bin
-      ./build
-    '';
-  };
-
   color = buildFromGitHub {
     rev      = "9aae6aaa22315390f03959adca2c4d395b02fcef";
     owner    = "fatih";