Merge branch 'chore/ddw-1189-new-cardano-wallet-flake' into chore/ddw-1189-new-cardano-wallet--with-flakes

Author: michalrus

installers/common/MacInstaller.hs

@@ -32,6 +32,7 @@ import           Config
 import           RewriteLibs               (chain)
 import           Types
 import           Util                      (rewritePackageJson)
+import qualified Control.Foldl             as Fold
 
 data DarwinConfig = DarwinConfig {
     dcAppNameApp :: Text -- ^ Daedalus.app for example
@@ -377,6 +378,10 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
 
       procs "chmod" ["-R", "+w", tt dir] empty
 
+      dylibs <- Turtle.fold (Turtle.find (Turtle.suffix ".dylib") (bridge </> "bin")) Fold.list
+      forM_ dylibs $ \f ->
+        cp f (dir </> filename f)
+
       rmtree $ dataDir </> "app/installers"
 
       -- Rewrite libs paths and bundle them

installers/common/WindowsInstaller.hs

@@ -226,6 +226,9 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                       file [] "genesis-alonzo.json"
                     file [] "libsodium-23.dll"
                     file [] "libsecp256k1-1.dll"
+                    file [] "libsecp256k1-0.dll"
+                    file [] "libssl-3-x64.dll"
+                    file [] "libcrypto-3-x64.dll"
                     when (clusterName == Selfnode) $ do
                       file [] "signing.key"
                       file [] "delegation.cert"

installers/daedalus-installer.cabal

@@ -29,6 +29,7 @@ library
                      , unordered-containers
                      , containers
                      , directory
+                     , foldl
                      , github
                      , lens-aeson
                      , megaparsec

nix/cardano-bridge.nix

@@ -12,7 +12,7 @@ runCommandCC "daedalus-cardano-bridge" {
   cp ${cardano-wallet}/bin/* .
   cp -f ${cardano-address}/bin/cardano-address* .
   cp -f ${cardano-shell.haskellPackages.cardano-launcher.components.exes.cardano-launcher}/bin/* .
-  cp -f ${cardano-node}/bin/cardano-node* .
+  cp -f ${cardano-node}/bin/* .
   cp -f ${cardano-cli}/bin/cardano-cli* .
   ${lib.optionalString (local-cluster != null) ''