Unverified Commit 0a1650c3 authored by jade's avatar jade Committed by GitHub
Browse files

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

nix-doc: fix build for Rust 1.79+
parents a9bd9d2b e430cf4d

pkgs/tools/package-management/nix-doc/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -35,13 +35,11 @@ rustPlatform.buildRustPackage rec { 
  # 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=";
@@ -51,7 +49,7 @@ rustPlatform.buildRustPackage rec { 
    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";

  };