From a3600cc7abde2e2cab2ddc683e784cfaf0c13e65 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Sat, 26 Oct 2024 18:13:47 +0000 Subject: [PATCH 1/3] stfl: link with libiconv on darwin --- pkgs/development/libraries/stfl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 91a41ac35298..fe6278a1d78b 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, libiconv }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "stfl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - buildInputs = [ ncurses libiconv ]; + buildInputs = [ ncurses ]; # Silence warnings related to use of implicitly declared library functions and implicit ints. # TODO: Remove and/or fix with patches the next time this package is updated. @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "-Wno-error=implicit-function-declaration" "-Wno-error=implicit-int" ]; + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-liconv"; }; preBuild = '' From bd6feec224fdf2f44b99d33304905bc3c6a5aa15 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Sat, 26 Oct 2024 19:32:55 +0000 Subject: [PATCH 2/3] stfl: 0.24 -> 0.24-unstable-2021-11-29 update repo to https://github.com/newsboat/stfl as previous is no longer available --- pkgs/development/libraries/stfl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index fe6278a1d78b..db1b0200cd91 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "stfl"; - version = "0.24"; + version = "0.24-unstable-2021-11-29"; - src = fetchurl { - url = "http://www.clifford.at/stfl/stfl-${version}.tar.gz"; - sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; + src = fetchFromGitHub { + owner ="newsboat"; + repo = "stfl"; + rev = "c2c10b8a50fef613c0aacdc5d06a0fa610bf79e9"; + hash = "sha256-os1yQ6o4m7yBiEZQIPP64diRleIr7FtuQucUbWs4A6k="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From 710c97f7bc4dc6dc11bd1538b60cecd7bd2f2270 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Sat, 26 Oct 2024 19:49:43 +0000 Subject: [PATCH 3/3] stfl: update homepage --- pkgs/development/libraries/stfl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index db1b0200cd91..d53d22006036 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.clifford.at/stfl/"; + homepage = "https://web.archive.org/web/20211113222004/http://www.clifford.at/stfl/"; description = "Library which implements a curses-based widget set for text terminals"; maintainers = with lib.maintainers; [ lovek323 ]; license = lib.licenses.lgpl3;