Merge pull request #330923 from philiptaron/nix-doc-build-fixes

nix-doc: fix build for Rust 1.79+

jade 0a1650c3 a9bd9d2b

Changed files
+4 -6
pkgs
tools
package-management
nix-doc
+4 -6
pkgs/tools/package-management/nix-doc/default.nix
···
# the wrong Nix version (disabling bindnow permits loading libraries
# requiring unavailable symbols if they are unreached)
hardeningDisable = lib.optionals withPlugin [ "bindnow" ];
-
# Due to a Rust bug, setting -Z relro-level to anything including "off" on
+
+
# Due to a Rust bug, setting -C relro-level to anything including "off" on
# macOS will cause link errors
env = lib.optionalAttrs (withPlugin && stdenv.isLinux) {
-
# nix-doc does not use nightly features, however, there is no other way to
-
# set relro-level
-
RUSTC_BOOTSTRAP = 1;
-
RUSTFLAGS = "-Z relro-level=partial";
+
RUSTFLAGS = "-C relro-level=partial";
};
cargoHash = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw=";
···
longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script";
homepage = "https://github.com/lf-/nix-doc";
license = licenses.lgpl3Plus;
-
maintainers = [ ];
+
maintainers = [ maintainers.philiptaron ];
platforms = platforms.unix;
mainProgram = "nix-doc";
};