Skip to content

Commit

Permalink
Merge pull request NixOS#5462 from edolstra/remove-source-tarball
Browse files Browse the repository at this point in the history
Remove references to building from the source tarball
  • Loading branch information
edolstra committed Nov 2, 2021
2 parents b8532c9 + b61b307 commit 647baaa
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 26 deletions.
11 changes: 2 additions & 9 deletions doc/manual/src/installation/building-source.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
# Building Nix from Source

After unpacking or checking out the Nix sources, issue the following
commands:
After cloning Nix's Git repository, issue the following commands:

```console
$ ./bootstrap.sh
$ ./configure options...
$ make
$ make install
```

Nix requires GNU Make so you may need to invoke `gmake` instead.

When building from the Git repository, these should be preceded by the
command:

```console
$ ./bootstrap.sh
```

The installation path can be specified by passing the `--prefix=prefix`
to `configure`. The default installation directory is `/usr/local`. You
can change this to any location you like. You must have write permission
Expand Down
4 changes: 2 additions & 2 deletions doc/manual/src/installation/installing-source.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Installing Nix from Source

If no binary package is available, you can download and compile a source
distribution.
If no binary package is available or if you want to hack on Nix, you
can build Nix from its Git repository.
15 changes: 5 additions & 10 deletions doc/manual/src/installation/obtaining-source.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# Obtaining a Source Distribution
# Obtaining the Source

The source tarball of the most recent stable release can be downloaded
from the [Nix homepage](http://nixos.org/nix/download.html). You can
also grab the [most recent development
release](http://hydra.nixos.org/job/nix/master/release/latest-finished#tabs-constituents).

Alternatively, the most recent sources of Nix can be obtained from its
[Git repository](https://github.com/NixOS/nix). For example, the
following command will check out the latest revision into a directory
called `nix`:
The most recent sources of Nix can be obtained from its [Git
repository](https://github.com/NixOS/nix). For example, the following
command will check out the latest revision into a directory called
`nix`:

```console
$ git clone https://github.com/NixOS/nix
Expand Down
8 changes: 3 additions & 5 deletions doc/manual/src/installation/prerequisites-source.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

- GNU Autoconf (<https://www.gnu.org/software/autoconf/>) and the
autoconf-archive macro collection
(<https://www.gnu.org/software/autoconf-archive/>). These are only
needed to run the bootstrap script, and are not necessary if your
source distribution came with a pre-built `./configure` script.
(<https://www.gnu.org/software/autoconf-archive/>). These are
needed to run the bootstrap script.

- GNU Make.

Expand Down Expand Up @@ -52,8 +51,7 @@
you need version 2.5.35, which is available on
[SourceForge](http://lex.sourceforge.net/). Slightly older versions
may also work, but ancient versions like the ubiquitous 2.5.4a
won't. Note that these are only required if you modify the parser or
when you are building from the Git repository.
won't.

- The `libseccomp` is used to provide syscall filtering on Linux. This
is an optional dependency and can be disabled passing a
Expand Down

0 comments on commit 647baaa

Please sign in to comment.