Merge pull request #311338 from RaghavSood/miniscript/2023-03-16

miniscript: unstable-2022-07-19 -> unstable-2023-03-16

pkgs/applications/blockchains/miniscript/default.nix

@@ -1,16 +1,31 @@
-{ stdenv, lib, fetchFromGitHub }:
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+}:
 
 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
@@ -19,12 +34,14 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description     = "Compiler and inspector for the miniscript Bitcoin policy language";
+    description = "Compiler and inspector for the miniscript Bitcoin policy language";
     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 ];
+    homepage = "https://bitcoin.sipa.be/miniscript/";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      RaghavSood
+      jb55
+    ];
     mainProgram = "miniscript";
   };
 }