fix crossSystem typo and cardano-shell

input-output-hk · Feb 25, 2020 · 3e7195f · 3e7195f
1 parent 3ce679a
commit 3e7195f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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";