From b629048249ae63117ff90a813037dccab2965983 Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Tue, 3 Jan 2017 19:00:39 +0000 Subject: [PATCH] Just check for nimdistros instead of adding an additional define. --- nimble.nimble | 2 +- readme.markdown | 2 +- src/nimblepkg/nimscriptapi.nim | 3 --- src/nimblepkg/nimscriptsupport.nim | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nimble.nimble b/nimble.nimble index fde18da..68b439b 100644 --- a/nimble.nimble +++ b/nimble.nimble @@ -22,7 +22,7 @@ srcDir = "src" requires "nim >= 0.13.0", "compiler#head" -when defined(nimbledistros): +when defined(nimdistros): import distros if detectOs(Ubuntu): foreignDep "libssl-dev" diff --git a/readme.markdown b/readme.markdown index 8616438..97a28d5 100644 --- a/readme.markdown +++ b/readme.markdown @@ -590,7 +590,7 @@ As an example, to specify a dependency on openssl you may put this in your .nimble file: ```nim -when defined(nimbledistros): +when defined(nimdistros): import distros if detectOs(Ubuntu): foreignDep "libssl-dev" diff --git a/src/nimblepkg/nimscriptapi.nim b/src/nimblepkg/nimscriptapi.nim index 81c3f9e..b711851 100644 --- a/src/nimblepkg/nimscriptapi.nim +++ b/src/nimblepkg/nimscriptapi.nim @@ -22,9 +22,6 @@ var foreignDeps*: seq[string] = @[] ## The foreign dependencies. Only ## exported for 'distros.nim'. -when defined(nimdistros) and defined(nimblesupportsdistros): - const nimbledistros = true - proc requires*(deps: varargs[string]) = ## Call this to set the list of requirements of your Nimble ## package. diff --git a/src/nimblepkg/nimscriptsupport.nim b/src/nimblepkg/nimscriptsupport.nim index 2a74ea3..3121e5b 100644 --- a/src/nimblepkg/nimscriptsupport.nim +++ b/src/nimblepkg/nimscriptsupport.nim @@ -241,7 +241,6 @@ proc execScript(scriptName: string, flags: StringTableRef, defineSymbol("nimscript") defineSymbol("nimconfig") defineSymbol("nimble") - defineSymbol("nimblesupportsdistros") registerPass(semPass) registerPass(evalPass)