diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-22 20:23:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 20:23:20 +0100 |
| commit | 4f29b8ec7a847e39cc138787d5e1a034fef9890d (patch) | |
| tree | 6d8b9c85e7ad7382e65ca3cf42c8a772ea8e189e /pkgs/applications | |
| parent | f2816e47aba98c4e694cec3ccb7bc92f440e0511 (diff) | |
| parent | 744c971973c8235b135d5a7b291e673c13b32a55 (diff) | |
| download | nixlib-4f29b8ec7a847e39cc138787d5e1a034fef9890d.tar nixlib-4f29b8ec7a847e39cc138787d5e1a034fef9890d.tar.gz nixlib-4f29b8ec7a847e39cc138787d5e1a034fef9890d.tar.bz2 nixlib-4f29b8ec7a847e39cc138787d5e1a034fef9890d.tar.lz nixlib-4f29b8ec7a847e39cc138787d5e1a034fef9890d.tar.xz nixlib-4f29b8ec7a847e39cc138787d5e1a034fef9890d.tar.zst nixlib-4f29b8ec7a847e39cc138787d5e1a034fef9890d.zip | |
Merge pull request #50530 from jb55/bump-clightning
clightning: 0.6.1 -> 0.6.2
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/altcoins/clightning.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix index 5ef1c06688de..6ae6ae7801f2 100644 --- a/pkgs/applications/altcoins/clightning.nix +++ b/pkgs/applications/altcoins/clightning.nix @@ -1,22 +1,23 @@ { 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; - 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)" ]; @@ -24,6 +25,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 |