diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/games/2048-in-terminal/default.nix | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/games/2048-in-terminal/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/games/2048-in-terminal/default.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/games/2048-in-terminal/default.nix b/nixpkgs/pkgs/games/2048-in-terminal/default.nix index 8ac72db65f5f..8f527534bb44 100644 --- a/nixpkgs/pkgs/games/2048-in-terminal/default.nix +++ b/nixpkgs/pkgs/games/2048-in-terminal/default.nix @@ -1,28 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "2048-in-terminal"; - version = "2017-11-29"; + version = "2021-09-12"; src = fetchFromGitHub { - sha256 = "1cqv5z1i5zcrvj0w6pdfnnff8m6kjndqxwkwsw5ma9jz503bmyc6"; - rev = "4e525066b0ef3442e92d2ba8dd373bdc205ece28"; + sha256 = "1jgacyimn59kxqhrk8jp13qayc2mncxhx393spqcxbz0sj6lxq9p"; + rev = "466abe827638598e40cb627d2b017fe8f76b3a14"; repo = "2048-in-terminal"; owner = "alewmoose"; }; - buildInputs = [ ncurses ]; + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/alewmoose/2048-in-terminal/pull/6 + patches = [ + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/alewmoose/2048-in-terminal/commit/b1c78dc4b3cca3a193b1afea1ab85a75966823cf.patch"; + sha256 = "05ibpgr83r7zxsak2l0gaf33858bp0sp0mjfdpmcmw745z3jw7q1"; + }) + ]; - prePatch = '' - sed -i '1i#include <fcntl.h>\n' save.c - ''; + buildInputs = [ ncurses ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; preInstall = '' mkdir -p $out/bin ''; - installFlags = [ "DESTDIR=$(out)/bin" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { inherit (src.meta) homepage; |