rsstail: 2.1 -> 2.2 and libiconv darwin fix (#351414)
This commit is contained in:
commit
eed689539c
@ -1,25 +1,25 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }:
|
{ lib, stdenv, fetchFromGitHub, libmrss }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation (final: {
|
||||||
pname = "rsstail";
|
pname = "rsstail";
|
||||||
version = "2.1";
|
version = "2.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "folkertvanheusden";
|
owner = "folkertvanheusden";
|
||||||
repo = "rsstail";
|
repo = "rsstail";
|
||||||
rev = "6f2436185372b3f945a4989406c4b6a934fe8a95";
|
rev = "v${final.version}";
|
||||||
sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
|
hash = "sha256-wbdf9zhwMN7QhJ5WoJo1Csu0EcKUTON8Q2Ic5scbn7I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
buildInputs = [ libmrss ];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace Makefile --replace -liconv_hook ""
|
|
||||||
'';
|
|
||||||
|
|
||||||
makeFlags = [ "prefix=$(out)" ];
|
makeFlags = [ "prefix=$(out)" ];
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||||
|
NIX_LDFLAGS = "-liconv";
|
||||||
|
};
|
||||||
|
|
||||||
# just runs cppcheck linter
|
# just runs cppcheck linter
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
@ -31,8 +31,8 @@ stdenv.mkDerivation {
|
|||||||
detects a new entry it'll emit only that new entry.
|
detects a new entry it'll emit only that new entry.
|
||||||
'';
|
'';
|
||||||
homepage = "https://www.vanheusden.com/rsstail/";
|
homepage = "https://www.vanheusden.com/rsstail/";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Only;
|
||||||
maintainers = [ maintainers.Necior ];
|
maintainers = [ maintainers.Necior ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user