diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
| commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
| tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/doc/stdenv | |
| parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
| parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
| download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip | |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/doc/stdenv')
| -rw-r--r-- | nixpkgs/doc/stdenv/multiple-output.xml | 2 | ||||
| -rw-r--r-- | nixpkgs/doc/stdenv/stdenv.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/doc/stdenv/multiple-output.xml b/nixpkgs/doc/stdenv/multiple-output.xml index 83275bb2fbd1..51e1cc2e024a 100644 --- a/nixpkgs/doc/stdenv/multiple-output.xml +++ b/nixpkgs/doc/stdenv/multiple-output.xml @@ -106,7 +106,7 @@ </para> <para> - The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more details). + The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://github.com/NixOS/patchelf/blob/master/README">patchelf</link> for more details). </para> </section> diff --git a/nixpkgs/doc/stdenv/stdenv.xml b/nixpkgs/doc/stdenv/stdenv.xml index 1e97bf6157bb..e4cbdd4abb57 100644 --- a/nixpkgs/doc/stdenv/stdenv.xml +++ b/nixpkgs/doc/stdenv/stdenv.xml @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "libfoo-1.2.3"; src = fetchurl { - url = http://example.org/libfoo-1.2.3.tar.bz2; + url = "http://example.org/libfoo-1.2.3.tar.bz2"; sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; }; }</programlisting> @@ -1295,7 +1295,7 @@ installTargets = "install-bin install-doc";</programlisting> </term> <listitem> <para> - List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib bin sbin</literal>. + List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib lib32 lib64 libexec bin sbin</literal>. </para> </listitem> </varlistentry> |