Docs build: depend on locally built nix executable and not installed one#5145
Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom Nov 30, 2023
Merged
Docs build: depend on locally built nix executable and not installed one#5145Ericson2314 merged 1 commit intoNixOS:masterfrom
Ericson2314 merged 1 commit intoNixOS:masterfrom
Conversation
|
I marked this as stale due to inactivity. → More info |
Contributor
Author
|
This still seems to be present in current master. Would it make sense to merge this? (I didn't re-check if it still applies cleanly right now, but can do it if the MR would be considered worth still) Thanks! |
fricklerhandwerk
added
documentation
contributor-experience
Previously many of the documentation targets were depending on `$(bindir)/nix` which is the installed version. This meant that its install rules would be triggered (which in chain would also trigger the install of libraries, as reported in NixOS#5140). Therefore a build of the documentation without an installation would not be possible (which apart from doing unwanted operations it may also generate permission problems for example). The fix makes the rules depend on `$(nix_PATH)` instead, which is the executable in the build tree.
Ericson2314
force-pushed
the
local_doc_build_5140
branch
from
d7c09d1 to
d536c57
Compare
Ericson2314
requested review from
edolstra and
fricklerhandwerk
as code owners
Ericson2314
approved these changes
Nov 30, 2023
This was referenced Nov 30, 2023
Merged
tebowy
pushed a commit
to tebowy/nix
that referenced
this pull request
Jul 11, 2024
Docs build: depend on locally built nix executable and not installed one (cherry picked from commit ca72e3e) === includes changes from (because not doing so removes manpages): Merge pull request NixOS#9976 from alois31/restore-manual-pages Restore manual pages (cherry picked from commit d3c1997) Change-Id: I685ff16163ac552a1754570c03c992c63a461d50
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously many of the documentation targets were depending on
$(bindir)/nix which is the installed version. This meant that its
install rules would be triggered (which in chain would also trigger
the install of libraries, as reported in #5140). Therefore a build
of the documentation without an installation would not be possible
(which apart from doing unwanted operations it may also generate
permission problems for example).
The fix makes the rules depend on $(nix_DIR)/nix instead, which is
the executable in the build tree.
Fixes #5140.