diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-03 21:11:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-03 21:11:26 +0100 |
| commit | e76bdf8b87920b87a2a2e728c2e40ff24ca39ffe (patch) | |
| tree | ffcb4e08f2d00acaf670c8344e6a12da6ea39772 /guix | |
| parent | 81dbd783bd9afabd1d8720c9b60a6a93492bb581 (diff) | |
| download | gnu-guix-e76bdf8b87920b87a2a2e728c2e40ff24ca39ffe.tar gnu-guix-e76bdf8b87920b87a2a2e728c2e40ff24ca39ffe.tar.gz | |
build: Clearly mark Nixpkgs as optional.
* configure.ac: Always show the result of checking for Nixpkgs. Don't
warn when Nixpkgs is not found.
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Remove `--with-nixpkgs'
flag.
* guix/utils.scm (%nixpkgs-directory): Use either the compile-time or
the run-time `NIXPKGS' environment variable.
* release.nix (jobs.tarball, jobs.build): Remove `--with-nixpkgs'
configure flag.
* README: Mark Nixpkgs as optional.
* distro/packages/databases.scm, distro/packages/guile.scm,
distro/packages/typesetting.scm: Change uses of `nixpkgs-derivation*'
to `nixpkgs-derivation', to avoid failing at compile-time.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/utils.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/utils.scm b/guix/utils.scm index 3e334f9fa6..287a6d4f3a 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -458,7 +458,8 @@ starting from the right of S." (define %nixpkgs-directory (make-parameter ;; Capture the build-time value of $NIXPKGS. - (compile-time-value (getenv "NIXPKGS")))) + (or (compile-time-value (getenv "NIXPKGS")) + (getenv "NIXPKGS")))) (define* (nixpkgs-derivation attribute #:optional (system (%current-system))) "Return the derivation path of ATTRIBUTE in Nixpkgs." |