From e801159c66fec7360df82ee63129db970a23470c Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 22 Jan 2020 01:13:19 -0500 Subject: [PATCH] cockatrice: 2017-08-31 -> 2019-08-31 - formatting - add wrapQtAppsHook - use fetchFromGitHub instead of fetchurl - don't construct name manually - add homepage to meta - remove repositories.get from meta - use mkDerivation instead of stdenv.mkDerivation - add qtwebsockets dependency --- pkgs/games/cockatrice/default.nix | 42 +++++++++++++++++-------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index fa3b906268d..cc85d556216 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, cmake, qtbase, qtmultimedia, protobuf, qttools +{ stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf +, qtbase, qtmultimedia, qttools, qtwebsockets, wrapQtAppsHook }: -stdenv.mkDerivation rec { - name = "${pname}-unstable-${version}"; - pname = "cockatrice"; - version = "2017-01-20"; +mkDerivation rec { + pname = "cockatrice"; + version = "2019-08-31-Release-2.7.2"; - src = fetchurl { - url = "https://github.com/Cockatrice/Cockatrice/archive/${version}-Release.tar.gz"; - sha256 = "1gbcn8vffqdagidlamx670jxymhzaw28r4c6aqg3pq0s6by1l65f"; - }; + src = fetchFromGitHub { + owner = "Cockatrice"; + repo = "Cockatrice"; + rev = "${version}"; + sha256 = "17nfz4z6zfkiwcrq1rpm8bc7zh4gvcmb3fis9gdjjbji20dvcfxp"; + }; - buildInputs = [ - cmake qtbase qtmultimedia protobuf qttools - ]; + buildInputs = [ + cmake qtbase qtmultimedia protobuf qttools qtwebsockets + ]; - 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 ]; - platforms = with stdenv.lib.platforms; linux; - }; + nativeBuildInputs = [ wrapQtAppsHook ]; + + meta = { + homepage = "https://github.com/Cockatrice/Cockatrice"; + description = "A cross-platform virtual tabletop for multiplayer card games"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ spencerjanssen ]; + platforms = with stdenv.lib.platforms; linux; + }; }