From 3c1d7118e6cf60df88a6e44509cd137c8cf6b4ac Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 17 Nov 2018 14:54:03 -0800 Subject: [PATCH 1/2] clightning: 0.6.1 -> 0.6.2 Signed-off-by: William Casarin --- pkgs/applications/altcoins/clightning.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 5ef1c06688de..91a2157f1193 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -1,17 +1,17 @@ { stdenv, python3, pkgconfig, which, libtool, autoconf, automake, - autogen, sqlite, gmp, zlib, fetchFromGitHub }: + autogen, sqlite, gmp, zlib, fetchFromGitHub, fetchpatch }: with stdenv.lib; stdenv.mkDerivation rec { name = "clightning-${version}"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { fetchSubmodules = true; owner = "ElementsProject"; repo = "lightning"; rev = "v${version}"; - sha256 = "0qx30i1c97ic4ii8bm0sk9dh76nfg4ihl9381gxjj14i4jr1q8y4"; + sha256 = "18yns0yyf7kc4p4n1crxdqh37j9faxkx216nh2ip7cxj4x8bf9gx"; }; enableParallelBuilding = true; @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { ./configure --prefix=$out --disable-developer --disable-valgrind ''; + # NOTE: remove me in 0.6.3 + patches = [ + (fetchpatch { + name = "clightning_0_6_2-compile-error.patch"; + url = https://patch-diff.githubusercontent.com/raw/ElementsProject/lightning/pull/2070.patch; + sha256 = "1576fqik5zcpz5zsvp2ks939bgiz0jc22yf24iv61000dd5j6na9"; + }) + ]; + postPatch = '' echo "" > tools/refresh-submodules.sh patchShebangs tools/generate-wire.py From 744c971973c8235b135d5a7b291e673c13b32a55 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 22 Nov 2018 19:16:36 +0100 Subject: [PATCH 2/2] clightning: split native build inputs --- pkgs/applications/altcoins/clightning.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 91a2157f1193..6ae6ae7801f2 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ which sqlite gmp zlib autoconf libtool automake autogen python3 pkgconfig ]; + nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which ]; + buildInputs = [ sqlite gmp zlib python3 ]; makeFlags = [ "prefix=$(out)" ];