Use nixpkgs from haskell.nix

input-output-hk · Aug 8, 2022 · 81be297 · 81be297
1 parent bc597c4
commit 81be297
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/default.nix b/default.nix
@@ -11,7 +11,6 @@
 , sourcesOverride ? { }
 , sources ? import ./nix/sources.nix { inherit system; } // sourcesOverride
 , haskellNix ? import sources.haskell-nix {
-    pkgs = import sources.nixpkgs { inherit system; };
     sourcesOverride = {
       hackage = sources.hackage-nix;
       stackage = sources.stackage-nix;

diff --git a/nix/default.nix b/nix/default.nix
@@ -33,16 +33,17 @@ let
     ++ ownOverlays;
 
 
-  pkgs = import sources.nixpkgs {
-    inherit crossSystem;
+  nixpkgsArgs = haskellNix.nixpkgsArgs // {
+    overlays = haskellNix.nixpkgsArgs.overlays ++ extraOverlays ++ overlays;
+    config = haskellNix.nixpkgsArgs.config // config;
     # In nixpkgs versions older than 21.05, if we don't explicitly pass
     # in localSystem we will hit a code path that uses builtins.currentSystem,
     # which breaks flake's pure evaluation.
     localSystem = { inherit system; };
-    overlays = extraOverlays ++ overlays;
-    config = haskellNix.nixpkgsArgs.config // config;
   };
 
+  pkgs = import haskellNix.sources.nixpkgs-unstable nixpkgsArgs;
+
   marlowe = import ./pkgs { inherit pkgs checkMaterialization enableHaskellProfiling sources source-repo-override; };
 
 in