diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-05 15:33:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-05 15:33:17 +0000 |
| commit | ebb43a3f6717d6e7204daa36235f1915cd4e60c5 (patch) | |
| tree | bd81ad289e5318a38d60ec672c569c1e3b0a9577 /doc/manual/default.nix | |
| parent | e7494da962a5882aecfd654117a0748a67936a37 (diff) | |
| download | nixpkgs-ebb43a3f6717d6e7204daa36235f1915cd4e60c5.tar nixpkgs-ebb43a3f6717d6e7204daa36235f1915cd4e60c5.tar.gz nixpkgs-ebb43a3f6717d6e7204daa36235f1915cd4e60c5.tar.bz2 nixpkgs-ebb43a3f6717d6e7204daa36235f1915cd4e60c5.tar.lz nixpkgs-ebb43a3f6717d6e7204daa36235f1915cd4e60c5.tar.xz nixpkgs-ebb43a3f6717d6e7204daa36235f1915cd4e60c5.tar.zst nixpkgs-ebb43a3f6717d6e7204daa36235f1915cd4e60c5.zip | |
* Make the location of Nixpkgs a function argument (defaulting
to ../../nixpkgs). This makes the "pkgs" symlink under the nixos checkout unnecessary. svn path=/nixos/trunk/; revision=11989
Diffstat (limited to 'doc/manual/default.nix')
| -rw-r--r-- | doc/manual/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/manual/default.nix b/doc/manual/default.nix index a42b947cd59..b83a4ce5dce 100644 --- a/doc/manual/default.nix +++ b/doc/manual/default.nix @@ -1,6 +1,8 @@ +{nixpkgsPath ? ../../../nixpkgs}: + let - pkgs = import ../../pkgs/top-level/all-packages.nix {}; + pkgs = import "${nixpkgsPath}/pkgs/top-level/all-packages.nix" {}; options = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML (pkgs.lib.optionAttrSetToDocList "" |