Skip to content

ed: Fix output directories by not setting DESTDIR. Fixes #32150#32315

Closed
berce wants to merge 1 commit intoNixOS:masterfrom
berce:master
Closed

ed: Fix output directories by not setting DESTDIR. Fixes #32150#32315
berce wants to merge 1 commit intoNixOS:masterfrom
berce:master

Conversation

@berce
Copy link
Contributor

@berce berce commented Dec 4, 2017

Motivation for this change

DESTDIR was set manually, but other configureFlags were missing. Nix could fill the gaps, but that resulted in some wrong directories: man pages ended up in /nix/store/<hash>-ed/nix/store/<hash>-ed/share/.
The solution is simple: let nix figure it all out.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Dec 4, 2017
@berce
Copy link
Contributor Author

berce commented Dec 4, 2017

Since this seems to cause a mass rebuild. Please review the full file for other modernizations.

Isn't e.g. unpackCmd = "tar --lzip -xf"; obsolete?
Do the tests still fail on Darwin?

@orivej orivej changed the base branch from master to staging December 4, 2017 17:54
@orivej orivej changed the base branch from staging to master December 4, 2017 17:54
@berce berce changed the base branch from master to staging December 4, 2017 19:36
@berce berce changed the base branch from staging to master December 4, 2017 19:41
@berce berce closed this Dec 4, 2017
@berce berce mentioned this pull request Dec 4, 2017
Merged
8 tasks
orivej added a commit that referenced this pull request Dec 4, 2017
@orivej
Merge pull request #32322 from berce/staging
a9b5900 
ed: fix docs location. Fixes #32150. Supersedes #32315.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@berce @GrahamcOfBorg