Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

top-level: Remove useless abstractions #29584

Merged
merged 3 commits into from Sep 20, 2017
Merged

top-level: Remove useless abstractions #29584

merged 3 commits into from Sep 20, 2017

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Sep 20, 2017 •
edited

Motivation for this change

  1. forcedNativePackages is not needed if splicing and buildPackages is used correctly.

  2. wrapCCCross is not needed now that gcc-cross-wrapper has been removed in lieu of a generalized cc-wrapper.

The vim change is good practice, and needed to get the perfect hash diff :).

Things done

All tested native and cross hashes are preserved. (!)

@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Sep 20, 2017
@mention-bot
Copy link

@Ericson2314, thanks for your PR! By analyzing the history of the files in this pull request, we identified @civodul, @bosu and @zimbatm to be potential reviewers.

@Ericson2314 Ericson2314 self-assigned this Sep 20, 2017
@Ericson2314 Ericson2314 merged commit 19e3c58 into NixOS:master Sep 20, 2017
@Ericson2314 Ericson2314 deleted the no-wrapCCCross branch September 20, 2017 05:27
@edolstra
Copy link
Member

Hm, what's the point of doing a pull request if you merge it yourself a minute later?

@Ericson2314
Copy link
Member Author

Ericson2314 commented Sep 20, 2017 •
edited

Eh, the benefits are minor, but I prefer doing that to just pushing directly in order to

  1. Give people that watch a retroactive notification

  2. Be able to label the change (e.g. cross-compilation) as I did above.

  3. Keep the history more uniform as people without privileges have to go through PR.

@Ericson2314 Ericson2314 added this to Needed for binutils-wrapper in Cross compilation Sep 20, 2017
@orivej
Copy link
Contributor

orivej commented Sep 29, 2017

@Ericson2314 Was this comment obsoleted?

nixpkgs/pkgs/top-level/all-packages.nix

Lines 7398 to 7403 in 8d4ef09

/* Make pkgconfig always return a nativeDrv, never a proper crossDrv,
because most usage of pkgconfig as buildInput (inheritance of
pre-cross nixpkgs) means using it using as nativeBuildInput
cross_renaming: we should make all programs use pkgconfig as
nativeBuildInput after the renaming.
*/

How is the case of pkgconfig in buildInputs handled now?

@Ericson2314
Copy link
Member Author

Ericson2314 commented Sep 29, 2017 •
edited

@orivej Manually :). I re-categorized enough that the existing cross tests, along with a bunch of stuff that I am personally building, are not affected by this.

edit at that was in #29039 so there was a race with one PR and not the other I suppose. And yes that comment should be removed too, good catch.

@orivej orivej mentioned this pull request Sep 29, 2017
Merged
@orivej
Copy link
Contributor

orivej commented Sep 29, 2017

All right, could you delete the comment then?

@Ericson2314
Copy link
Member Author

64c3a2e here you go!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ericson2314 Ericson2314

Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on
Projects
No open projects
Cross compilation
Needed for binutils-wrapper
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ericson2314 @mention-bot @edolstra @orivej