This commit is contained in:
shimun 2020-12-18 18:51:29 +01:00
parent 72c1cf7120
commit 8b414ad669
Signed by: shimun
GPG Key ID: E81D8382DC2F971B

View File

@ -7,19 +7,22 @@
}: }:
let let
crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; }; crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; };
overrides = pkgs.defaultCrateOverrides // rec { overrides = with pkgs; let
nettle-sys = attrs: with pkgs; { clang = llvmPackages_10.clang;
propagatedBuildInputs = [ clang nettle pkg-config ]; libclang = llvmPackages_10.libclang;
LIBCLANG_PATH = "${clang.cc.lib}/lib"; in
defaultCrateOverrides // rec {
nettle-sys = attrs: rec {
nativeBuildInputs = [ clang pkg-config ];
buildInputs = [ nettle ];
LIBCLANG_PATH = "${libclang}/lib";
}; };
sequoia-openpgp = attrs: with pkgs; { brownpaper = attrs: {
nativeBuildInputs = [ clang gmp pkg-config ]; buildInputs = [ gmp ];
LIBCLANG_PATH = "${clang.cc.lib}/lib";
}; };
brownpaper = sequoia-openpgp; # requires gmp as well
}; };
client = pkgs.writeShellScriptBin "brownpaper" '' client = pkgs.writeShellScriptBin "brownpaper" ''
PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@" PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
''; '';
in 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; }