From 07cf03630f88e8e0b1c8eab755734fa7e3c225d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 23 Feb 2020 19:22:30 +0100 Subject: [PATCH] lbzip2: fix build The release tarball is no longer available at the specified URL, so building from git. Also, the gnulib in the release tarball was too old for our recent glibc version. --- pkgs/tools/compression/lbzip2/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 7e9cc055abf..99d41c06ec6 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,13 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { - name = "lbzip2-2.5"; + version = "2.5"; + name = "lbzip2-${version}"; - src = fetchurl { - url = "http://archive.lbzip2.org/${name}.tar.gz"; - sha256 = "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6"; + src = fetchFromGitHub { + owner = "kjn"; + repo = "lbzip2"; + sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; + rev = "v${version}"; }; + buildInputs = [ gnulib perl ]; + nativeBuildInputs = [ autoconf automake ]; + + preConfigure = '' + ./build-aux/autogen.sh + ''; + meta = with stdenv.lib; { homepage = "https://github.com/kjn/lbzip2"; # Formerly http://lbzip2.org/ description = "Parallel bzip2 compression utility";