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

postgresql: fix build on darwin #20684

Merged
merged 1 commit into from
Nov 24, 2016
Merged

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Nov 24, 2016

This fixes the build of postgresql on OS X as reported by @jwiegley.

Tested on both NixOS en OS X.

@edolstra this also needs to be cherry picked on release-16.09.

@mention-bot
Copy link

@basvandijk, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @vcunat and @BFrog to be potential reviewers.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Nov 24, 2016
@LnL7
Copy link
Member

LnL7 commented Nov 24, 2016

I thought this was already fixed.

''
# initdb needs access to "locale" command from glibc.
wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
wrapProgram $out/bin/initdb --prefix PATH ":" ${pkgs.glibc.bin}/bin
Copy link
Member

Choose a reason for hiding this comment

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

Is pkgs.glibc neccesary, I think it's fine to use glibc directly as long as it's not evaluated on darwin.

@basvandijk
Copy link
Member Author

@LnL7 thanks for the tip. I pushed a correction.

@LnL7 LnL7 merged commit aaa40f7 into NixOS:master Nov 24, 2016
@basvandijk
Copy link
Member Author

@LnL7 thanks for the merge. Could you also cherry pick this on release-16.09 please because that also contains the darwin bug?

@LnL7
Copy link
Member

LnL7 commented Nov 24, 2016

I'm not sure if changes like this are usually backported to nixos release branches.

/cc @copumpkin

@basvandijk
Copy link
Member Author

@LnL7 note that @edolstra cherry picked my postgresql-9.6 patch (which introduced the darwin error) on release-16.09. So the fix should also be cherry picked on that branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants