From ba5d88f4ece1ff16b95b5ac623d2ba14e55a7111 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 00:16:18 +0800 Subject: miniscript: unstable-2022-07-19 -> unstable-2023-03-16 --- pkgs/applications/blockchains/miniscript/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/blockchains/miniscript') diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index e96d3732b7c43..84b1b55f66184 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -6,15 +6,26 @@ stdenv.mkDerivation rec { pname = "miniscript"; - version = "unstable-2022-07-19"; + version = "unstable-2023-03-16"; src = fetchFromGitHub { owner = "sipa"; repo = pname; - rev = "ca675488c4aa9605f6ae70c0e68a148a6fb277b4"; - sha256 = "sha256-kzLIJ0os6UnC0RPEybfw6wGrZpgmRCgj3zifmZjieoU="; + rev = "6806dfb15a1fafabf7dd28aae3c9d2bc49db01f1"; + sha256 = "sha256-qkYDzsl2Y4WEDDXs9cE/jIXm01jclkYUQbDGe1S0wYs="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + # Replace hardcoded g++ with c++ so clang can be used + # on darwin + # + # lto must be disabled on darwin as well due to + # https://github.com/NixOS/nixpkgs/issues/19098 + substituteInPlace Makefile \ + --replace-fail 'g++' 'c++' \ + --replace-fail '-flto' "" + ''; + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -27,7 +38,6 @@ stdenv.mkDerivation rec { longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; homepage = "https://bitcoin.sipa.be/miniscript/"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ RaghavSood jb55 -- cgit 1.4.1