Skip to content

Commit

Permalink
daedalus-bridge: override configuration.yaml (input-output-hk#1587)
Browse files Browse the repository at this point in the history
  • Loading branch information
disassembler authored and nikolaglumac committed Oct 11, 2019
1 parent a28b128 commit b8c58c6
Show file tree
Hide file tree
Showing 2 changed files with 15,408 additions and 7 deletions.
18 changes: 11 additions & 7 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,14 @@ let
);
throwSystem = throw "Unsupported system: ${pkgs.stdenv.hostPlatform.system}";
ghcWithCardano = cardanoSL.haskellPackages.ghcWithPackages (ps: [ ps.cardano-sl ps.cardano-sl-x509 ]);
daedalus-bridge = cardanoSL.daedalus-bridge.overrideAttrs (oldAttrs: {
buildCommand = ''
${oldAttrs.buildCommand}
cp ${./installers/cardano-configuration.yaml} $out/config/configuration.yaml
'';
});
packages = self: {
inherit cluster pkgs version;
inherit (cardanoSL) daedalus-bridge;
inherit cluster pkgs version daedalus-bridge;

# a cross-compiled fastlist for the ps-list package
fastlist = pkgs.pkgsCross.mingwW64.callPackage ./fastlist.nix {};
Expand All @@ -72,7 +77,7 @@ let
# the native makensis binary, with cross-compiled windows stubs
nsis = nsisNixPkgs.callPackage ./nsis.nix {};

unsignedUnpackedCardano = cardanoSL.daedalus-bridge;
unsignedUnpackedCardano = daedalus-bridge;
unpackedCardano = if dummyInstaller then self.dummyUnpacked else (if needSignedBinaries then self.signedCardano else self.unsignedUnpackedCardano);
signFile = file: let
localSigningScript = pkgs.writeScript "signing-script" ''
Expand Down Expand Up @@ -235,8 +240,7 @@ let

## TODO: move to installers/nix
hsDaedalusPkgs = import ./installers {
inherit (cardanoSL) daedalus-bridge;
inherit localLib system;
inherit localLib system daedalus-bridge;
};
daedalus-installer = pkgs.haskell.lib.justStaticExecutables self.hsDaedalusPkgs.daedalus-installer;
daedalus = self.callPackage ./installers/nix/linux.nix {};
Expand All @@ -248,7 +252,7 @@ let
rawapp = self.callPackage ./yarn2nix.nix {
inherit buildNum;
api = "ada";
apiVersion = cardanoSL.daedalus-bridge.version;
apiVersion = daedalus-bridge.version;
};
rawapp-win64 = self.rawapp.override { win64 = true; };
source = builtins.filterSource cleanSourceFilter ./.;
Expand Down Expand Up @@ -368,7 +372,7 @@ let
inherit (self) postInstall preInstall cluster rawapp;
inherit pkgs;
installationSlug = installPath;
installedPackages = [ daedalus' self.postInstall self.namespaceHelper daedalus'.cfg self.daedalus-bridge daedalus'.daedalus-frontend self.xdg-open ];
installedPackages = [ daedalus' self.postInstall self.namespaceHelper daedalus'.cfg daedalus-bridge daedalus'.daedalus-frontend self.xdg-open ];
nix-bundle = self.nix-bundle;
}).installerBundle;
};
Expand Down
Loading

0 comments on commit b8c58c6

Please sign in to comment.