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 /distro/packages | |
| parent | 81dbd783bd9afabd1d8720c9b60a6a93492bb581 (diff) | |
| download | patches-e76bdf8b87920b87a2a2e728c2e40ff24ca39ffe.tar patches-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 'distro/packages')
| -rw-r--r-- | distro/packages/databases.scm | 8 | ||||
| -rw-r--r-- | distro/packages/guile.scm | 2 | ||||
| -rw-r--r-- | distro/packages/typesetting.scm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/distro/packages/databases.scm b/distro/packages/databases.scm index 5c42ef142b..9cae6916f9 100644 --- a/distro/packages/databases.scm +++ b/distro/packages/databases.scm @@ -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")))) diff --git a/distro/packages/guile.scm b/distro/packages/guile.scm index 8c25ee9af6..464379bc47 100644 --- a/distro/packages/guile.scm +++ b/distro/packages/guile.scm @@ -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") diff --git a/distro/packages/typesetting.scm b/distro/packages/typesetting.scm index 5ca33c628a..40c9e998a0 100644 --- a/distro/packages/typesetting.scm +++ b/distro/packages/typesetting.scm @@ -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 |