From e4718193ed3ef73f2ff21999b7ebb6dd2c8e6ffc Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 7 Jul 2021 13:38:48 -0400
Subject: [PATCH] modules was a bust; maybe this way gets overlays to right
place
---
default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/default.nix b/default.nix
index 9689f6b..c17e7c0 100644
--- a/default.nix
+++ b/default.nix
@@ -18,15 +18,15 @@ let
haskellNix.sources.nixpkgs-2009
# These arguments passed to nixpkgs, include some patches and also
# the haskell.nix functionality itself as an overlay.
- haskellNix.nixpkgsArgs;
+ (haskellNix.nixpkgsArgs // {
+ overlays = haskellNix.nixpkgsArgs.overlays ++ [
+ (import ./odlnix/overlays.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 = [{
- # Help it find the non-Haskell dependency libchallenge_bypass_ristretto_ffi.
- pkgs = pkgs.extend (import ./oldnix/overlay.nix);
- }];
}
--
GitLab