From 7d4057ee5715b11e07936ba7c0df820b5da9e116 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 7 Jul 2021 14:13:58 -0400 Subject: [PATCH] just another stab in the dark --- default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 0cc22a9..51a432b 100644 --- a/default.nix +++ b/default.nix @@ -18,15 +18,18 @@ 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 // { - overlays = haskellNix.nixpkgsArgs.overlays ++ [ - (import ./oldnix/overlay.nix) - ]; - }); + haskellNix.nixpkgsArgs; + libchallenge_bypass_ristretto_ffi = pkgs.callPackage ./oldnix/challenge-bypass-ristretto.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 = [{ + packages.PaymentServer.components.library.pkgconfig = pkgs.lib.mkForce [ + [libchallenge_bypass_ristretto_ffi] + ]; + }]; } -- GitLab