mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2025-12-28 17:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let the environment variable NIMBLE_DIR overrides nimblepath in cfg file (#6542)

Browse Source 
* Let the environment variable NIMBLE_DIR overrides nimblepath in cfg file

If the length of NIMBLE_DIR is larger than zero, the nimblepath
will be set to $NIMBLE_DIR/pkgs
This commit is contained in:
Xiao-Yong
2017-10-28 02:38:31 -05:00
committed by Andreas Rumpf
parent 93fd0b0cb5
commit 616db85c61
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/commands.nim
View File

@@ -343,7 +343,9 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
# keep the old name for compat
if pass in {passCmd2, passPP} and not options.gNoNimblePath:
expectArg(switch, arg, pass, info)
let path = processPath(arg, info, notRelativeToProj=true)
var path = processPath(arg, info, notRelativeToProj=true)
let nimbleDir = getEnv("NIMBLE_DIR")
if nimbleDir.len > 0 and pass == passPP: path = nimbleDir / "pkgs"
nimblePath(path, info)
of "nonimblepath", "nobabelpath":
expectNoArg(switch, arg, pass, info)

3
tests/testament/categories.nim
View File

@@ -324,9 +324,10 @@ type PackageFilter = enum
pfExtraOnly
pfAll
var nimbleDir = getEnv("NIMBLE_DIR").string
if nimbleDir.len == 0: nimbleDir = getHomeDir() / ".nimble"
let
nimbleExe = findExe("nimble")
nimbleDir = getHomeDir() / ".nimble"
packageDir = nimbleDir / "pkgs"
packageIndex = nimbleDir / "packages.json"

4
tools/nimresolve.nim
View File

@@ -127,7 +127,9 @@ proc resolve(t: Task) =
when considerNimbleDirs:
if not t.noNimblePath:
if findInNimbleDir(t, getHomeDir() / ".nimble" / "pkgs"): return
var nimbleDir = getEnv("NIMBLE_DIR")
if nimbleDir.len == 0: nimbleDir = getHomeDir() / ".nimble"
if findInNimbleDir(t, nimbleDir / "pkgs"): return
when not defined(windows):
if findInNimbleDir(t, "/opt/nimble/pkgs"): return