From f35339734c2a2bcc10fc402fe51a22125cf44d59 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 12 Jul 2021 10:30:46 -0400
Subject: [PATCH] no need to override anything if the lib has the right
pkgconfig stuff :/
---
default.nix | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/default.nix b/default.nix
index 8e8f92d..c144f27 100644
--- a/default.nix
+++ b/default.nix
@@ -23,18 +23,11 @@ let
# These arguments passed to nixpkgs, include some patches and also
# the haskell.nix functionality itself as an overlay.
(haskellNix.nixpkgsArgs // { overlays = allOverlays; });
-
- hsPkgs = pkgs.haskell-nix.project {
+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 = ./.;
};
- };
-in
- pkgs.lib.recursiveUpdate hsPkgs {
- PaymentServer.components.library = hsPkgs.PaymentServer.components.library.overrideAttrs (old: {
- PKG_CONFIG_PATH = "${pkgs.libchallenge_bypass_ristretto_ffi.lib}/pkgconfig";
- NIX_LDFLAGS = "-L${pkgs.libchallenge_bypass_ristretto_ffi.lib}/lib";
- });
}
--
GitLab