diff --git a/doerg/default.nix b/doerg/default.nix index 5c24894..e743654 100644 --- a/doerg/default.nix +++ b/doerg/default.nix @@ -7,6 +7,7 @@ , fake-git , our-tex ? callPackage ./our-tex.nix {} , makeWrapper +, writeText }: let @@ -23,11 +24,23 @@ let plex = ibm-plex-web.override { families = [ "math" "serif" "sans" "sans-kr" ]; }; + bin-path = lib.makeBinPath [ doerg-parser our-tex doerg-temml-worker ]; + + doerg-config = writeText "doerg-config.edn" '' + tee $out < "net/deertopia/doerg/config.edn" - io/resource (read-config (System/getenv "DOERG_CONFIG")))] + io/resource + (read-config (System/getProperty "net.deertopia.doerg.config") + (System/getenv "DOERG_CONFIG")))] (if (s/invalid? r) (throw (IllegalArgumentException. "default config is bad!")) diff --git a/publisher/default.nix b/publisher/default.nix index 9f757d9..f8da10b 100644 --- a/publisher/default.nix +++ b/publisher/default.nix @@ -9,7 +9,9 @@ mkCljBin { projectSrc = ./.; lockfile = ../deps-lock.json; main-ns = "net.deertopia.publisher.main"; - buildInputs = []; + buildInputs = [ + doerg + ]; nativeBuildInputs = [ babashka ]; diff --git a/publisher/override_deps.bb b/publisher/override_deps.bb index 3a0899a..d6ebe39 100644 --- a/publisher/override_deps.bb +++ b/publisher/override_deps.bb @@ -20,7 +20,9 @@ (loop [os (seq overrides) loc zloc] (if-some [[[k v] & xs] os] - (recur xs (z/assoc loc k v)) + (do (printf "override dep %s with %s\n" + (pr-str k) (pr-str v)) + (recur xs (z/assoc loc k v))) loc))) (defn args->overrides [args] diff --git a/publisher/src/net/deertopia/publisher/config.clj b/publisher/src/net/deertopia/publisher/config.clj index 6c6661a..3f5224d 100644 --- a/publisher/src/net/deertopia/publisher/config.clj +++ b/publisher/src/net/deertopia/publisher/config.clj @@ -19,6 +19,7 @@ (def default (-> "net/deertopia/publisher/config.edn" io/resource - (read-config (System/getenv "DOERG_PUBLISHER_CONFIG")))) + (read-config (System/getProperty "net.deertopia.publisher.config") + (System/getenv "DOERG_PUBLISHER_CONFIG")))) (def ^:dynamic *cfg* default)