Multiple improvements and refactorizations

This commit is contained in:
Jonas Juselius
2019-12-17 22:12:50 +01:00
parent f4f53d90e1
commit a3fa5ebc36
3 changed files with 91 additions and 55 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {}, ...}:
{ pkgs ? import <nixpkgs> {}, initca ? "", ...}:
with pkgs;
let
initca' =
@@ -22,11 +22,12 @@ let
buildInputs = [ pkgs.cfssl ];
} '' cfssl genkey -initca ${ca_csr} | cfssljson -bare ca; \
mkdir -p $out; cp *.pem $out'';
ca = if initca != "" then initca else initca';
in
# make ca derivation sha depend on initca cfssl output
pkgs.stdenv.mkDerivation {
name = "ca";
src = initca';
src = ca;
buildCommand = ''
mkdir -p $out;
cp -r $src/* $out