From 467fedb41550ec75752373663d5ce6bcd9c71eed Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 8 Jul 2021 14:45:42 -0400
Subject: [PATCH] explicitly set some env vars to make the build succeed
this is absolutely the wrong way to do it
---
default.nix | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/default.nix b/default.nix
index bf008fd..57d68e2 100644
--- a/default.nix
+++ b/default.nix
@@ -30,22 +30,15 @@ let
name = "PaymentServer";
src = ./.;
};
- modules = [{
- packages.PaymentServer.components.library.libs = [
- pkgs.pkg-config
- pkgs.libchallenge_bypass_ristretto_ffi
- ];
- }];
};
in
- hsPkgs
- # pkgs.lib.recursiveUpdate hsPkgs {
- # PaymentServer.setup.propagatedNativeBuildInputs = [
- # pkgs.pkg-config
- # pkgs.libchallenge_bypass_ristretto_ffi
- # ];
- # PaymentServer.components.library.propagatedNativeBuildInputs = [
- # pkgs.pkg-config
- # pkgs.libchallenge_bypass_ristretto_ffi
- # ];
- # }
+ 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";
+
+ nativeBuildInputs = with pkgs; hsPkgs.PaymentServer.components.library.nativeBuildInputs ++ [
+ libchallenge_bypass_ristretto_ffi
+ ];
+ });
+ }
--
GitLab