8 files changed, 15 insertions(+), 15 deletions(-)

M Makefile.am
M README
M configure.ac
M distro/packages/databases.scm
M distro/packages/guile.scm
M distro/packages/typesetting.scm
M guix/utils.scm
M release.nix

@@ 171,5 171,5 @@ info_TEXINFOS = doc/guix.texi
 EXTRA_DIST += doc/fdl-1.3.texi
 
 ACLOCAL_AMFLAGS = -I m4
-AM_DISTCHECK_CONFIGURE_FLAGS =					\
-  --with-nixpkgs=$(NIXPKGS) --with-nix-prefix="$(NIX_PREFIX)"
+AM_DISTCHECK_CONFIGURE_FLAGS =			\
+  --with-nix-prefix="$(NIX_PREFIX)"

@@ 19,7 19,7 @@ Guix currently depends on the following packages:
   - [[http://nixos.org/nix/][Nix]]
   - [[http://gnupg.org/][GNU libgcrypt]], or [[http://nongnu.org/libchop/][libchop]]
 
-For bootstrapping purposes, it is useful to reuse packages from Nixpkgs.
+Optionally, packages from Nixpkgs may be transparently reused from Guix.
 For this to work, you need to have a checkout of the Nixpkgs repository;
 the `--with-nixpkgs' option allows you to let `configure' know where the
 Nixpkgs checkout is.

@@ 52,13 52,12 @@ AC_ARG_WITH([nixpkgs],
    esac],
   [])
 
+AC_MSG_CHECKING([for Nixpkgs source tree])
 if test -f "$NIXPKGS/default.nix"; then
-   AC_MSG_CHECKING([for Nixpkgs source tree])
    AC_MSG_RESULT([$NIXPKGS])
    AC_SUBST([NIXPKGS])
 else
-   AC_MSG_WARN([Nixpkgs not found; this will prevent most tests from running.])
-   AC_MSG_WARN([Please use `--with-nixpkgs'.])
+   AC_MSG_RESULT([not found])
 fi
 
 AC_ARG_WITH([libgcrypt-prefix],

@@ 41,10 41,10 @@
              (base32
               "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky"))))
    (build-system gnu-build-system)
-   (inputs `(("curl" ,(nixpkgs-derivation* "curl"))
-             ("emacs" ,(nixpkgs-derivation* "emacs"))
-             ("check" ,(nixpkgs-derivation* "check"))
-             ("bc" ,(nixpkgs-derivation* "bc"))
+   (inputs `(("curl" ,(nixpkgs-derivation "curl"))
+             ("emacs" ,(nixpkgs-derivation "emacs"))
+             ("check" ,(nixpkgs-derivation "check"))
+             ("bc" ,(nixpkgs-derivation "bc"))
              ("patch/gets"
               ,(search-patch "diffutils-gets-undeclared.patch"))))
    (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets"))))

@@ 45,7 45,7 @@ or 2.0."
                "1svlyk5pm4fsdp2g7n6qffdl6fdggxnlicj0jn9s4lxd63gzxy1n"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkgconfig" ,pkg-config)
-                    ("gperf" ,(nixpkgs-derivation* "gperf"))))
+                    ("gperf" ,(nixpkgs-derivation "gperf"))))
    (inputs `(("guile" ,guile)))
    (description "Guile-Reader, a simple framework for building readers for
 GNU Guile")

@@ 94,7 94,7 @@
                "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq"))))
     (build-system gnu-build-system)               ; actually, just a makefile
     (outputs '("out" "doc"))
-    (inputs `(("ghostscript" ,(nixpkgs-derivation* "ghostscript"))))
+    (inputs `(("ghostscript" ,(nixpkgs-derivation "ghostscript"))))
     (arguments `(#:modules ((guix build utils)
                             (guix build gnu-build-system)
                             (srfi srfi-1))        ; we need SRFI-1

@@ 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."

@@ 51,7 51,7 @@ let
         buildInputs = with pkgs; [ guile ];
         buildNativeInputs = with pkgs; [ texinfo gettext cvs pkgconfig ];
         configureFlags =
-          [ "--with-nixpkgs=${nixpkgs}" "--with-nix-prefix=${pkgs.nix}" ];
+          [ "--with-nix-prefix=${pkgs.nix}" ];
       };
 
     build =


@@ 64,7 64,7 @@ let
         buildNativeInputs = [ pkgs.pkgconfig ];
         src = jobs.tarball;
         configureFlags =
-          [ "--with-nixpkgs=${nixpkgs}" "--with-nix-prefix=${pkgs.nix}"
+          [ "--with-nix-prefix=${pkgs.nix}"
             "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
           ];