Verified Commit 1c3c93f8 authored by doshitan's avatar doshitan

Add niv to shell inputs

parent 35ddc9ac
......@@ -6,7 +6,7 @@
let
overlay = newPkgs: oldPkgs: {
niv = import sources.niv {};
niv = (import sources.niv {}).niv;
merriweather = oldPkgs.stdenv.mkDerivation rec {
name = "merriweather-${version}";
......@@ -26,7 +26,7 @@ let
};
lib = oldPkgs.lib // (with oldPkgs.lib; rec {
applyFuncs = funcs: drv: lib.foldl' (drv': f: f drv') drv funcs;
applyFuncs = funcs: drv: foldl' (drv': f: f drv') drv funcs;
contentSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (
(type == "symlink")
......
......@@ -14,6 +14,9 @@ in
packages = p: [project.executable project.doshitan-css-exec];
inherit withHoogle;
LUNR_FILE = project.contentLunrFile;
# TODO: this is for niv, should be set in the niv drv?
SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt";
NIX_SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt";
buildInputs = builtins.concatLists [
(haskellDevTools haskellPkgs)
(with haskellPkgs; [
......@@ -23,6 +26,8 @@ in
pkgs.terraform
# for font make targets
pkgs.unzip pkgs.curl
# misc. tools
pkgs.niv
# for local deploys
] ++ project.ciInputs
# for elm stuff mostly
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment