Merge pull request #146878 from trofi/fix-_2048-in-terminal-for-ncureses-6.3

_2048-in-terminal: 2017-11-29 -> 2021-09-12

authored by

Thiago Kenji Okada and committed by
GitHub
4f871e23 2ba4d24e

+16 -9
+16 -9
pkgs/games/2048-in-terminal/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, ncurses }: 2 3 stdenv.mkDerivation rec { 4 pname = "2048-in-terminal"; 5 - version = "2017-11-29"; 6 7 src = fetchFromGitHub { 8 - sha256 = "1cqv5z1i5zcrvj0w6pdfnnff8m6kjndqxwkwsw5ma9jz503bmyc6"; 9 - rev = "4e525066b0ef3442e92d2ba8dd373bdc205ece28"; 10 repo = "2048-in-terminal"; 11 owner = "alewmoose"; 12 }; 13 14 - buildInputs = [ ncurses ]; 15 16 - prePatch = '' 17 - sed -i '1i#include <fcntl.h>\n' save.c 18 - ''; 19 20 enableParallelBuilding = true; 21 22 preInstall = '' 23 mkdir -p $out/bin 24 ''; 25 - installFlags = [ "DESTDIR=$(out)/bin" ]; 26 27 meta = with lib; { 28 inherit (src.meta) homepage;
··· 1 + { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }: 2 3 stdenv.mkDerivation rec { 4 pname = "2048-in-terminal"; 5 + version = "2021-09-12"; 6 7 src = fetchFromGitHub { 8 + sha256 = "1jgacyimn59kxqhrk8jp13qayc2mncxhx393spqcxbz0sj6lxq9p"; 9 + rev = "466abe827638598e40cb627d2b017fe8f76b3a14"; 10 repo = "2048-in-terminal"; 11 owner = "alewmoose"; 12 }; 13 14 + # Fix pending upstream inclusion for ncurses-6.3 support: 15 + # https://github.com/alewmoose/2048-in-terminal/pull/6 16 + patches = [ 17 + (fetchpatch { 18 + name = "ncurses-6.3.patch"; 19 + url = "https://github.com/alewmoose/2048-in-terminal/commit/b1c78dc4b3cca3a193b1afea1ab85a75966823cf.patch"; 20 + sha256 = "05ibpgr83r7zxsak2l0gaf33858bp0sp0mjfdpmcmw745z3jw7q1"; 21 + }) 22 + ]; 23 24 + buildInputs = [ ncurses ]; 25 + nativeBuildInputs = [ pkg-config ]; 26 27 enableParallelBuilding = true; 28 29 preInstall = '' 30 mkdir -p $out/bin 31 ''; 32 + installFlags = [ "PREFIX=$(out)" ]; 33 34 meta = with lib; { 35 inherit (src.meta) homepage;