Skip to content

Commit 472c4c4

Browse files
committed
Exec nix-shell using working directory of nix-config
1 parent 59c57f5 commit 472c4c4

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nix-env-selector",
33
"displayName": "Nix Environment Selector",
44
"description": "Allows switch environment for Visual Studio Code and extensions based on Nix config file.",
5-
"version": "1.0.6",
5+
"version": "1.0.7",
66
"keywords": [
77
"nix",
88
"nix-env",

src/main/ext/nix_env.cljs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(ns ext.nix-env
22
(:require ["child_process" :refer [exec execSync]]
3+
["path" :refer [dirname]]
34
[clojure.string :as s]
45
[promesa.core :as p]))
56

@@ -39,13 +40,14 @@
3940

4041
(defn get-nix-env-sync [options]
4142
(-> (get-shell-env-cmd options)
42-
(execSync)
43+
(execSync (clj->js {:cwd (dirname (:nix-config options))}))
4344
(.toString)
4445
(parse-exported-vars)))
4546

4647
(defn get-nix-env-async [options]
4748
(let [env-result (p/deferred)]
4849
(exec (get-shell-env-cmd options)
50+
(clj->js {:cwd (dirname (:nix-config options))})
4951
(fn [err result]
5052
(if (nil? err)
5153
(p/resolve! env-result result)

0 commit comments

Comments
 (0)