From 95682cdfb7596466a30e610c01bd0c8fad39e877 Mon Sep 17 00:00:00 2001
From: Samadi van Koten <me@vktec.co.uk>
Date: Mon, 28 Nov 2016 23:02:30 +0000
Subject: [PATCH] Remove docgen.nim's dependency on things being in path

compiler/docgen.nim relied heavily on $lib/packages/docutils being in
path at compile-time. While this works fine when building Nim itself,
things start breaking when using compiler as a nimble package.
---
 compiler/docgen.nim | 6 ++++--
 compiler/nim.cfg    | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index 76b36d7962..2115449249 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -13,8 +13,10 @@
 
 import
   ast, strutils, strtabs, options, msgs, os, ropes, idents,
-  wordrecg, syntaxes, renderer, lexer, rstast, rst, rstgen, times, highlite,
-  importer, sempass2, json, xmltree, cgi, typesrenderer, astalgo
+  wordrecg, syntaxes, renderer, lexer, packages/docutils/rstast,
+  packages/docutils/rst, packages/docutils/rstgen, times,
+  packages/docutils/highlite, importer, sempass2, json, xmltree, cgi,
+  typesrenderer, astalgo
 
 type
   TSections = array[TSymKind, Rope]
diff --git a/compiler/nim.cfg b/compiler/nim.cfg
index 0ff128ba3c..853ae7e00d 100644
--- a/compiler/nim.cfg
+++ b/compiler/nim.cfg
@@ -4,8 +4,6 @@ hint[XDeclaredButNotUsed]:off
 path:"llvm"
 path:"$projectPath/.."
 
-path:"$lib/packages/docutils"
-
 define:booting
 #import:"$projectpath/testability"