cardano-address: add to daedalus bridge

input-output-hk · Jun 19, 2020 · e6efdae · e6efdae
1 parent e898fd5
commit e6efdae
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/default.nix b/default.nix
@@ -81,6 +81,7 @@ let
     };
     cardano-wallet = import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; crossSystem = crossSystem walletPkgs.lib; };
     cardano-wallet-native = import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; };
+    cardano-address = (import self.sources.cardano-wallet { inherit system; gitrev = self.sources.cardano-wallet.rev; crossSystem = crossSystem walletPkgs.lib; }).haskellPackages.cardano-addresses.components.exes.cardano-address;
     cardano-shell = import self.sources.cardano-shell { inherit system; crossSystem = crossSystem shellPkgs.lib; };
     cardano-cli = (import self.sources.cardano-node { inherit system; crossSystem = crossSystem nodePkgs.lib; }).haskellPackages.cardano-cli.components.exes.cardano-cli;
     cardano-node-cluster = (import self.sources.cardano-node { inherit system; crossSystem = crossSystem nodePkgs.lib; }).cluster;

diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs
@@ -266,7 +266,7 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
         mainBinary Byron = "cardano-wallet-byron"
       common bridge
       -- Executables (from daedalus-bridge)
-      forM_ [mainBinary kind, "cardano-node", "cardano-cli", "export-wallets" ] $ \f ->
+      forM_ [mainBinary kind, "cardano-node", "cardano-cli", "export-wallets", "cardano-address" ] $ \f ->
         cp (bridge </> "bin" </> f) (dir </> f)
       forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
@@ -280,7 +280,7 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       rmtree $ dataDir </> "app/installers"
 
       -- Rewrite libs paths and bundle them
-      void $ chain (encodeString dir) $ fmap tt [dir </> "cardano-launcher", dir </> mainBinary kind, dir </> "cardano-node", dir </> "cardano-cli", dir </> "export-wallets" ]
+      void $ chain (encodeString dir) $ fmap tt [dir </> "cardano-launcher", dir </> mainBinary kind, dir </> "cardano-node", dir </> "cardano-cli", dir </> "export-wallets", dir </> "cardano-address" ]
     Jormungandr bridge -> do
       common bridge
       -- Executables (from daedalus-bridge)

diff --git a/installers/common/WindowsInstaller.hs b/installers/common/WindowsInstaller.hs
@@ -206,6 +206,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{hasBlock0,inst
                     file [] "cardano-node.exe"
                     file [] (mainBinary kind)
                     file [] "export-wallets.exe"
+                    file [] "cardano-address.exe"
                     file [] "cardano-cli.exe"
                     file [] "config.yaml"
                     file [] "topology.yaml"

diff --git a/nix/cardano-bridge.nix b/nix/cardano-bridge.nix
@@ -1,4 +1,4 @@
-{ target, pkgs, cardanoWalletPkgs, runCommand, cardano-wallet, cardano-node, cardano-shell, export-wallets, cardano-cli }:
+{ target, pkgs, cardanoWalletPkgs, runCommand, cardano-wallet, cardano-node, cardano-shell, export-wallets, cardano-cli, cardano-address }:
 
 let
   commonLib = import ../lib.nix {};
@@ -13,6 +13,7 @@ in runCommand "daedalus-cardano-bridge" {
   cd $out/bin
   echo ${cardano-wallet.version} > $out/version
   cp ${cardano-wallet}/bin/* .
+  cp ${cardano-address}/bin/* .
   cp -f ${cardano-shell.nix-tools.cexes.cardano-launcher.cardano-launcher}/bin/cardano-launcher* .
   cp -f ${cardano-node}/bin/cardano-node* .
   cp -f ${export-wallets}/bin/export-wallets* .

diff --git a/nix/launcher-config.nix b/nix/launcher-config.nix
@@ -247,7 +247,7 @@ let
       macPackageName = "Daedalus${network}";
       dataDir = dataDir;
       hasBlock0 = false;
-      installerWinBinaries = [ "cardano-launcher.exe" "cardano-node.exe" "cardano-wallet-byron.exe" "export-wallets.exe" "cardano-cli.exe" ];
+      installerWinBinaries = [ "cardano-launcher.exe" "cardano-node.exe" "cardano-wallet-byron.exe" "export-wallets.exe" "cardano-cli.exe" "cardano-address.exe" ];
     };
 
   in {