From aa393f816c0647d889818879792b7b298b4a109b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 8 Jan 2009 21:50:27 +0000
Subject: [PATCH] Allowing direct package use in manual expression

svn path=/nixos/trunk/; revision=13724
---
 doc/manual/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/manual/default.nix b/doc/manual/default.nix
index a7f51adf287..56657aec2e2 100644
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -1,8 +1,10 @@
-{nixpkgsPath ? ../../../nixpkgs}:
+{nixpkgsPath ? ../../../nixpkgs, pkgs ? null}:
 
 let
 
-  pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {};
+  pkgs = if pkgs == null then 
+    import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {}
+  else pkgs;
 
   options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
     (builtins.toXML (pkgs.lib.optionAttrSetToDocList ""