From f71b14d64cebf2f4a50dcf35e9c76277fd9855e8 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 7 Jul 2021 13:29:06 -0400
Subject: [PATCH] does this get the overlay used?
---
default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/default.nix b/default.nix
index cb9a7c5..9689f6b 100644
--- a/default.nix
+++ b/default.nix
@@ -11,7 +11,7 @@ let
# niv add input-output-hk/haskell.nix -n haskellNix
# Import nixpkgs and pass the haskell.nix provided nixpkgsArgs
- pkgs' = import
+ pkgs = import
# haskell.nix provides access to the nixpkgs pins which are used by our CI,
# hence you will be more likely to get cache hits when using these.
# But you can also just use your own, e.g. '<nixpkgs>'.
@@ -19,14 +19,14 @@ let
# These arguments passed to nixpkgs, include some patches and also
# the haskell.nix functionality itself as an overlay.
haskellNix.nixpkgsArgs;
-
- # Help it find the non-Haskell dependency libchallenge_bypass_ristretto_ffi.
- pkgs = pkgs'.appendOverlays [(import ./oldnix/overlay.nix)];
in pkgs.haskell-nix.project {
# 'cleanGit' cleans a source directory based on the files known by git
src = pkgs.haskell-nix.haskellLib.cleanGit {
name = "PaymentServer";
src = ./.;
};
- modules = [];
+ modules = [{
+ # Help it find the non-Haskell dependency libchallenge_bypass_ristretto_ffi.
+ pkgs = pkgs.extend (import ./oldnix/overlay.nix);
+ }];
}
--
GitLab