shimun/brownpaper
1
0
Fork 0
Code Issues Pull Requests Releases Activity

update crate2nix

Browse Source
This commit is contained in:
shimun 2020-12-13 10:49:01 +01:00
parent 3b5bf84b18
commit 6d4af5f82c
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default.nix
View File

@ -1,11 +1,12 @@
{ pkgs ? import <nixpkgs> { } { pkgs ? import <nixpkgs> { }
, callPackage ? pkgs.callPackage , callPackage ? pkgs.callPackage
, stdenv ? pkgs.stdenv , stdenv ? pkgs.stdenv
, fetchgit ? pkgs.fetchgit
, name ? "brownpaper" , name ? "brownpaper"
, src ? (builtins.filterSource (path: type: baseNameOf path != "target") ./.) , src ? (builtins.filterSource (path: type: baseNameOf path != "target") ./.)
}: }:
let let
crate2nix_tools = import "${builtins.fetchTarball { url = "https://github.com/kolloch/crate2nix/archive/0.8.0.tar.gz"; sha256 = "17mmf5sqn0fmpqrf52icq92nf1sy5yacwx9vafk43piaq433ba56"; }}/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 = pkgs.defaultCrateOverrides // rec {
nettle-sys = attrs: with pkgs; { nettle-sys = attrs: with pkgs; {
nativeBuildInputs = [ clang nettle pkg-config ]; nativeBuildInputs = [ clang nettle pkg-config ];
@ -18,7 +19,7 @@ let
brownpaper = sequoia-openpgp; # requires gmp as well brownpaper = sequoia-openpgp; # requires gmp as well
}; };
client = pkgs.writeShellScriptBin "brownpaper" '' client = pkgs.writeShellScriptBin "brownpaper" ''
PATH=$PATH:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/ ${./bp.sh} $@ PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} $@
''; '';
in in
{ server = (crate2nix_tools.generatedCargoNix { inherit name src; }); inherit client; } { server = (crate2nix_tools.generatedCargoNix { inherit name src; }); inherit client; }