From c34b7c0102595649f953c93c859f83b740e7d136 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 15 Jan 2022 15:32:42 +0300 Subject: [PATCH] libxls: fix cross-compilation --- pkgs/development/libraries/libxls/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 3b9c2768f45..43c96027d08 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -1,21 +1,31 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf-archive }: stdenv.mkDerivation rec { pname = "libxls"; version = "1.6.2"; - src = fetchurl { - url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "sha256-XazDTZS/IRWSbIDG+2nk570u1kA9Uc/0kEGpQXL143E="; + src = fetchFromGitHub { + owner = "libxls"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vjmYByk+IDBon8xGR1+oNaEQTiJK+IVpDXsG1IyVNoY="; }; - nativeBuildInputs = [ unzip ]; + patches = [ + # Fix cross-compilation + (fetchpatch { + url = "https://github.com/libxls/libxls/commit/007e63c1f5e19bc73292f267c85d7dd14e9ecb38.patch"; + sha256 = "sha256-PjPHuXth4Yaq9nVfk5MYJMRo5B0R6YA1KEqgwfjF3PM="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook autoconf-archive ]; enableParallelBuilding = true; meta = with lib; { description = "Extract Cell Data From Excel xls files"; - homepage = "https://sourceforge.net/projects/libxls/"; + homepage = "https://github.com/libxls/libxls"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ];