From a1bef514cecf7c04c29f77b468a910bc7f7dc073 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 25 Oct 2019 15:23:52 +0300 Subject: [PATCH] castget: 1.2.4 -> 2.0.0 --- .../feedreaders/castget/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index 21f1e555a291..83132f030145 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -6,29 +6,37 @@ , curl , id3lib , libxml2 +, glibcLocales }: stdenv.mkDerivation rec { pname = "castget"; - version = "1.2.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mlj"; repo = pname; - # Upstream uses `_` instead of `.` for the version, let's hope it will - # change in the next release + # Upstream uses `_` instead of `.` for the version rev = "rel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1pfrjmsikv35cc0praxgim26zq4r7dfp1pkn6n9fz3fm73gxylyv"; + sha256 = "1129x64rw587q3sdpa3lrgs0gni5f0siwbvmfz8ya4zkbhgi2ik7"; }; - # Otherwise, the autoreconfHook fails since Makefile.am requires it - preAutoreconf = '' - touch NEWS - touch README - touch ChangeLog + + # without this, the build fails because of an encoding issue with the manual page. + # https://stackoverflow.com/a/17031697/4935114 + # This requires glibcLocales to be present in the build so it will have an impact. + # See https://github.com/NixOS/nixpkgs/issues/8398 + preBuild = '' + export LC_ALL="en_US.UTF-8"; ''; buildInputs = [ glib curl id3lib libxml2 ]; - nativeBuildInputs = [ ronn autoreconfHook pkgconfig ]; + nativeBuildInputs = [ + ronn + # See comment on locale above + glibcLocales + autoreconfHook + pkgconfig + ]; meta = with stdenv.lib; { description = "A simple, command-line based RSS enclosure downloader";