From 8b414ad669cf6575d488649aeb3671e328725822 Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Fri, 18 Dec 2020 18:51:29 +0100
Subject: [PATCH] deps

---
 default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index 72924fd..89e183f 100644
--- a/default.nix
+++ b/default.nix
@@ -7,19 +7,22 @@
 }:
 let
   crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; };
-  overrides = pkgs.defaultCrateOverrides // rec {
-    nettle-sys = attrs: with pkgs; {
-      propagatedBuildInputs = [ clang nettle pkg-config ];
-      LIBCLANG_PATH = "${clang.cc.lib}/lib";
+  overrides = with pkgs; let
+    clang = llvmPackages_10.clang;
+    libclang = llvmPackages_10.libclang;
+  in
+  defaultCrateOverrides // rec {
+    nettle-sys = attrs: rec {
+      nativeBuildInputs = [ clang pkg-config ];
+      buildInputs = [ nettle ];
+      LIBCLANG_PATH = "${libclang}/lib";
     };
-    sequoia-openpgp = attrs: with pkgs; {
-      nativeBuildInputs = [ clang gmp pkg-config ];
-      LIBCLANG_PATH = "${clang.cc.lib}/lib";
+    brownpaper = attrs: {
+      buildInputs = [ gmp ];
     };
-    brownpaper = sequoia-openpgp; # requires gmp as well
   };
   client = pkgs.writeShellScriptBin "brownpaper" ''
     PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
   '';
 in
-{ server = callPackage (crate2nix_tools.generatedCargoNix { inherit name src; }) { inherit pkgs; };  inherit client; }
+{ server = callPackage (crate2nix_tools.generatedCargoNix { inherit name src; }) { inherit pkgs; defaultCrateOverrides = overrides; };  inherit client; }