From 2281a4b8841b148e75f4a185d89ef6685fc270d0 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 15 Jun 2023 18:46:06 +1000 Subject: [PATCH] stag: fixup build on aarch64-linux --- pkgs/applications/misc/stag/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 21ca26012ddb..d8360dd7ccf4 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, curses }: +{ lib, stdenv, fetchFromGitHub, curses, fetchpatch }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "stag"; - version = "1.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "seenaburns"; repo = "stag"; - rev = "90e2964959ea8242349250640d24cee3d1966ad6"; - sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v"; + rev = "v${finalAttrs.version}"; + hash = "sha256-O3iHTsaFs1l9sQV7hOoh4F+w3t28JCNlwT33zBmUP/s="; }; + patches = [ + # fix compilation on aarch64 https://github.com/seenaburns/stag/pull/19 + (fetchpatch { + url = "https://github.com/seenaburns/stag/commit/0a5a8533d0027b2ee38d109adb0cb7d65d171497.diff"; + hash = "sha256-fqcsStduL3qfsp5wLJ0GLfEz0JRnOqsvpXB4gdWwVzg="; + }) + ]; + buildInputs = [ curses ]; installPhase = '' @@ -18,11 +26,10 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; license = licenses.bsdOriginal; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; }; -} +})