Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'

2 files changed, 25 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/games/boohu/default.nix b/nixpkgs/pkgs/games/boohu/default.nix
index 1e70a92066da..e658ef9f5cba 100644
--- a/nixpkgs/pkgs/games/boohu/default.nix
+++ b/nixpkgs/pkgs/games/boohu/default.nix
@@ -2,29 +2,29 @@
 
 buildGoPackage rec {
 
-  name = "boohu-${version}";
+  pname = "boohu";
   version = "0.12.0";
 
   goPackagePath = "git.tuxfamily.org/boohu/boohu.git";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz";
+    url = "https://download.tuxfamily.org/boohu/downloads/${pname}-${version}.tar.gz";
     sha256 = "0nf3xj3lda8279cqvjv5c3vpsb7d2kynwwna5yrsy7gq8c9n4rh8";
   };
 
-  buildFlags = "--tags ansi";
+  goDeps = ./deps.nix;
 
   postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu";
 
   meta = with stdenv.lib; {
-    description = "A new roguelike game";
+    description = "A new coffee-break roguelike game";
     longDescription = ''
       Break Out Of Hareka's Underground (Boohu) is a roguelike game mainly
       inspired from DCSS and its tavern, with some ideas from Brogue, but
       aiming for very short games, almost no character building, and a
       simplified inventory.
     '';
-    homepage = https://download.tuxfamily.org/boohu/index.html;
+    homepage = "https://download.tuxfamily.org/boohu/index.html";
     license = licenses.isc;
     platforms = platforms.unix;
     maintainers = with maintainers; [freepotion];
diff --git a/nixpkgs/pkgs/games/boohu/deps.nix b/nixpkgs/pkgs/games/boohu/deps.nix
new file mode 100644
index 000000000000..a785567adddf
--- /dev/null
+++ b/nixpkgs/pkgs/games/boohu/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "288510b9734e30e7966ec2f22b87c5f8e67345e3";
+      sha256 = "0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
+      sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
+    };
+  }
+]