From c65cfc8b669e1200d13a88602811f5acc2ac08de Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Fri, 23 Oct 2015 13:50:58 -0500
Subject: [PATCH 1/2] Add myself as a maintainer

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b64c236bde35..1d3e2e7a3bf6 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -261,6 +261,7 @@
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
+  spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";

From 0ebe4b615e47c9739adce956f5e3d202b67caf14 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Fri, 23 Oct 2015 13:58:42 -0500
Subject: [PATCH 2/2] cockatrice: init at 2015-09-24

---
 pkgs/games/cockatrice/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/games/cockatrice/default.nix

diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
new file mode 100644
index 000000000000..53aab088da01
--- /dev/null
+++ b/pkgs/games/cockatrice/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, qtbase, qtmultimedia, protobuf, qttools
+}:
+
+stdenv.mkDerivation rec {
+    name = "${pname}-${version}";
+    pname = "cockatrice";
+    version = "2015-09-24";
+
+    src = fetchurl {
+        url = "https://github.com/Cockatrice/Cockatrice/archive/${version}-Release.tar.gz";
+        sha256 = "068f93k3bg4cmdm0iyh2vfmk51nnzf3d6g6cvlm5q8dz1zk5nwzf";
+    };
+
+    buildInputs = [
+        cmake qtbase qtmultimedia protobuf qttools
+    ];
+
+    meta = {
+        repositories.git = git://github.com/Cockatrice/Cockatrice.git;
+        description = "A cross-platform virtual tabletop for multiplayer card games";
+        license = stdenv.lib.licenses.gpl2;
+        maintainers = with stdenv.lib.maintainers; [ spencerjanssen ];
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d3b6f157407..c44409cbb9ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13653,6 +13653,8 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
+  cockatrice = qt5Libs.callPackage ../games/cockatrice {  };
+
   confd = goPackages.confd.bin // { outputs = [ "bin" ]; };
 
   construoBase = lowPrio (callPackage ../games/construo {