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.

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

treewide: structured-attrs fixes #76674

Merged
merged 15 commits into from Dec 30, 2019

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Dec 30, 2019

Some fixes from #72074
that can probably go to master.

Originally introduced in 128901e,
it no longer appears to be necessary.
Do not use DESTDIR and bring makeFlags more in line with the Makefile:
https://github.com/sembruk/osm2xmap/blob/a5f9ceadf0b06c034850fb22c55f2be4dd43eaef/Makefile
Use makeFlags instead of patching Makefile
* Remove unnecessary linker and compiler flags
* Listify makeFlags
* Do not use DESTDIR (nasty)
* Let generic builder set --prefix configureFlag
* Install X11 app-defaults to more modern directory
* Format with nixpkgs-fmt
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!!

@jtojnar jtojnar merged commit ea4da9b into NixOS:master Dec 30, 2019
@jtojnar jtojnar deleted the structured-attrs-masterable branch December 30, 2019 03:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants