diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-20 20:21:03 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-20 20:21:03 -0500 |
| commit | dfc225d143142764daf2c1e933e7303a82f7b0cd (patch) | |
| tree | 351925e835e82d7f7d20a7eb8567b5a2aaa658c7 /doc | |
| parent | bd5374664663bbf1c2675c100eee8cfe14c6d148 (diff) | |
| parent | c55b5eb245198cf3fa58e477a301c90f754f6682 (diff) | |
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/stdenv.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 00fa7567c078..fa3a7ef056e6 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -718,7 +718,7 @@ the Nix store under <envar>out</envar>. The default install</command>.</para> <variablelist> - <title>Variables controlling the check phase</title> + <title>Variables controlling the install phase</title> <varlistentry> <term><varname>makeFlags</varname> / @@ -797,7 +797,7 @@ following: </para> <variablelist> - <title>Variables controlling the check phase</title> + <title>Variables controlling the fixup phase</title> <varlistentry> <term><varname>dontStrip</varname></term> |