This commit is contained in:
2020-12-16 15:23:19 +01:00
parent a2a3a8bc48
commit 72c1cf7120
5 changed files with 500 additions and 467 deletions

View File

@@ -9,7 +9,7 @@ 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; {
nativeBuildInputs = [ clang nettle pkg-config ];
propagatedBuildInputs = [ clang nettle pkg-config ];
LIBCLANG_PATH = "${clang.cc.lib}/lib";
};
sequoia-openpgp = attrs: with pkgs; {
@@ -22,4 +22,4 @@ let
PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
'';
in
{ server = (crate2nix_tools.generatedCargoNix { inherit name src; }); inherit client; }
{ server = callPackage (crate2nix_tools.generatedCargoNix { inherit name src; }) { inherit pkgs; }; inherit client; }