diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-28 00:12:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 00:12:12 +0000 |
| commit | 6982839dbfbfda6b2f2776498dae8022733f2969 (patch) | |
| tree | a14203958ff0af74fdb130d8caeae1c88b949698 /doc | |
| parent | 43dece63bf5dc936a2fc2fde69751730285c35f8 (diff) | |
| parent | e515dce8924197fceb090d9ba46cbb926a5784eb (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/vim.section.md | 2 | ||||
| -rw-r--r-- | doc/stdenv/stdenv.chapter.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index bf0d663179b92..5e25c1ed423e1 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -134,7 +134,7 @@ If one of your favourite plugins isn't packaged, you can package it yourself: { config, pkgs, ... }: let - easygrep = pkgs.vimUtils.buildVimPluginFrom2Nix { + easygrep = pkgs.vimUtils.buildVimPlugin { name = "vim-easygrep"; src = pkgs.fetchFromGitHub { owner = "dkprice"; diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 15cb081a04e22..08ee0e349d020 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1478,7 +1478,7 @@ This flag can break dynamic shared object loading. For instance, the module syst #### `bindnow` {#bindnow} -Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. +Adds the `-z now` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like: |