diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-10-25 04:24:19 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-10-25 04:24:19 +0300 |
| commit | 70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab (patch) | |
| tree | 1d5ff7a24d95639653efadcdae5aa1b2d20ac852 | |
| parent | c529bd85bb8ccb8a5377a49eb505936255a6a7fc (diff) | |
| parent | 0ebe4b615e47c9739adce956f5e3d202b67caf14 (diff) | |
| download | nixpkgs-70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab.tar nixpkgs-70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab.tar.gz nixpkgs-70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab.tar.bz2 nixpkgs-70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab.tar.lz nixpkgs-70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab.tar.xz nixpkgs-70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab.tar.zst nixpkgs-70f9d8168859c6ff0ed46b47b82dfeed3e6e36ab.zip | |
Merge pull request #10566 from spencerjanssen/cockatrice
cockatrice: init at 2015-09-24
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/cockatrice/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 27 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 233672e0bde..76858f3f28b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -263,6 +263,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>"; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix new file mode 100644 index 00000000000..53aab088da0 --- /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 4f7baaf98e2..4b465ff4360 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13667,6 +13667,8 @@ let chessdb = callPackage ../games/chessdb { }; + cockatrice = qt5Libs.callPackage ../games/cockatrice { }; + confd = goPackages.confd.bin // { outputs = [ "bin" ]; }; construoBase = lowPrio (callPackage ../games/construo { |