From c66cf653cbfb08c6181959a153f2e20de6daecd8 Mon Sep 17 00:00:00 2001
From: shimun <shimun@shimun.net>
Date: Sun, 2 May 2021 12:58:07 +0200
Subject: [PATCH] fix: string coerce err

---
 default.nix | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/default.nix b/default.nix
index bd64eb6..9e9ab44 100644
--- a/default.nix
+++ b/default.nix
@@ -7,28 +7,26 @@
 }:
 let
   filteredSrc = src; # flake only includeds files tracked by git builtins.filterSource pkgs.lib.cleanSourceFilter src;
-  crate2nix = fetchGit { url = "https://github.com/kolloch/crate2nix.git"; rev = "2f861db71475b4cf0d266b8d2fd625cccf1e331b"; };
+  crate2nix = fetchGit { url = "https://github.com/kolloch/crate2nix.git"; rev = "445c74fdbc7fe01694814b7bc349a89942c7d8a0"; };
   crate2nix_tools = (if builtins.compareVersions pkgs.crate2nix.version "0.8.0" == 1 then import (pkgs.crate2nix.src + "/tools.nix") else import "${crate2nix}/tools.nix") { inherit pkgs; };
-  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";
+  overrides = with pkgs.llvmPackages_10;
+    pkgs.defaultCrateOverrides // rec {
+      nettle-sys = attrs: rec {
+        nativeBuildInputs = [ clang pkgs.pkg-config ];
+        buildInputs = [ pkgs.nettle ];
+        LIBCLANG_PATH = "${libclang}/lib";
+      };
+      brownpaper = attrs: {
+        buildInputs = [ pkgs.gmp ];
+      };
     };
-    brownpaper = attrs: {
-      buildInputs = [ gmp (pkgs.callPackage "${crate2nix}/crate2nix/Cargo.nix" { strictDeprecation = true; }) ];
-    };
-  };
-  client = with pkgs; runCommandLocal "brownpaper" {
-    script = "${filteredSrc}/bp.sh";
-    nativeBuildInputs = [ makeWrapper ];
-  } ''
+  client = with pkgs; runCommandLocal "brownpaper"
+    {
+      script = "${filteredSrc}/bp.sh";
+      nativeBuildInputs = [ makeWrapper ];
+    } ''
     makeWrapper $script $out/bin/brownpaper \
-    --prefix PATH : ${lib.makeBinPath [ bash curl gnupg ]}
+    --prefix PATH : ${with pkgs; lib.makeBinPath [ bash curl gnupg ]}
   '';
 in
 { server = (callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }).rootCrate.build;  inherit client; }