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

Jump to bottom

php: fix on darwin #101840

Merged
merged 1 commit into from Nov 4, 2020
Merged

php: fix on darwin #101840

merged 1 commit into from Nov 4, 2020

Conversation

sikmir
Copy link
Member

@sikmir sikmir commented Oct 27, 2020

Motivation for this change

Fix build on darwin by disabling valgrind support, since valgrind is broken on darwin:

nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix

Line 89 in 791b40e

broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 27, 2020
@aanderse
Copy link
Member

If memory serves me correctly @talyz may have access to a darwin machine.

@sikmir sikmir mentioned this pull request Oct 27, 2020
Merged
10 tasks
SuperSandro2000
SuperSandro2000 approved these changes Oct 27, 2020
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

I can confirm that this fixes building on Darwin.

@Ma27
Copy link
Member

Ma27 commented Oct 27, 2020

Nice, so I don't have to use an old Mac from the office, thanks! :)

@SuperSandro2000
Copy link
Member

@Ma27 If you ever need a build confirmation feel free to ping me.

@etu etu merged commit 1872374 into NixOS:master Nov 4, 2020
@sikmir sikmir deleted the php branch November 4, 2020 09:27
@stephank stephank mentioned this pull request Mar 9, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@aanderse aanderse Awaiting requested review from aanderse aanderse is a code owner

@Ma27 Ma27 Awaiting requested review from Ma27 Ma27 is a code owner

@etu etu Awaiting requested review from etu

@globin globin Awaiting requested review from globin globin is a code owner

@talyz talyz Awaiting requested review from talyz talyz is a code owner

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sikmir @aanderse @Ma27 @SuperSandro2000 @etu