Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

recode: 3.7-gitrev -> 3.7.4, new home #68045

Merged
merged 4 commits into from Oct 22, 2019
Merged

recode: 3.7-gitrev -> 3.7.4, new home #68045

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a93659
recode: pname-ify
dtzWill Aug 19, 2019
f768ec6
recode: 3.7-* -> 3.7.2, new home
dtzWill Aug 19, 2019
178dd52
recode: use pre-generated tarball to avoid gen, fix
dtzWill Aug 19, 2019
68f25ed
recode: 3.7.2 -> 3.7.4
dtzWill Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 11 additions & 23 deletions pkgs/tools/text/recode/default.nix
View file
Open in desktop
@@ -1,34 +1,22 @@
{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook
, texinfo, libiconv, libintl }:
{ stdenv, fetchurl, python, perl, intltool, flex, texinfo, libiconv, libintl }:

stdenv.mkDerivation {
name = "recode-3.7-2fd838565";
stdenv.mkDerivation rec {
pname = "recode";
version = "3.7.4";

src = fetchFromGitHub {
owner = "pinard";
repo = "Recode";
rev = "2fd8385658e5a08700e3b916053f6680ff85fdbd";
sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03";
# Use official tarball, avoid need to bootstrap/generate build system
src = fetchurl {
url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0j9rjkgx4r8nah90d2vbi92k33gfmgaqlj72z1ni0vsiccpcgfc8";
};

nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ];
nativeBuildInputs = [ python python.pkgs.cython perl intltool flex texinfo libiconv ];
buildInputs = [ libintl ];

preAutoreconf = ''
# fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455
substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" ""
sed -i '/^AM_C_PROTOTYPES/d' configure.ac
substituteInPlace src/Makefile.am --replace "ansi2knr" ""
'';

doCheck = false; # fails 10 out of 16 tests

preCheck = ''
checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs")
'';
doCheck = true;

meta = {
homepage = https://www.gnu.org/software/recode/;
homepage = https://github.com/rrthomas/recode;
description = "Converts files between various character sets and usages";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl2Plus;
Expand Down