From 3e7195f188995a66737135a80cf110a4674b6968 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Mon, 24 Feb 2020 21:12:48 -0400 Subject: [PATCH] fix crossSystem typo and cardano-shell --- default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 517973e2ed..e071e1464e 100644 --- a/default.nix +++ b/default.nix @@ -22,10 +22,10 @@ let system = systemTable.${target} or target; pkgs = localLib.iohkNix.getPkgsDefault { inherit system config; }; sources = localLib.sources; - walletPkgs = import (import "${sources.cardano-wallet}/nix/sources.nix").nixpkgs {}; - shellPkgs = import (import "${sources.cardano-shell}/nix/sources.nix").nixpkgs {}; + walletPkgs = import "${sources.cardano-wallet}/nix" {}; + shellPkgs = (import "${sources.cardano-shell}/nix/iohk-common.nix").getPkgs {}; inherit (pkgs.lib) optionalString optional; - crossSystem = lib: (crossSystemTable.${target} or (x: null)) lib; + crossSystem = lib: (crossSystemTable lib).${target} or null; # TODO, nsis cant cross-compile with the nixpkgs daedalus currently uses nsisNixPkgs = import localLib.sources.nixpkgs-nsis {}; installPath = ".daedalus";