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

purple-matrix: set c compiler to cc, fixes build on osx #91978

Merged
merged 1 commit into from Jul 20, 2020
Merged

purple-matrix: set c compiler to cc, fixes build on osx #91978

merged 1 commit into from Jul 20, 2020

Conversation

fkautz
Copy link
Member

@fkautz fkautz commented Jul 2, 2020 •
edited

Signed-off-by: Frederick F. Kautz IV fkautz@alumni.cmu.edu

Motivation for this change

Fixing pidgin uncovered a build time issue in purple-matrix when building on OSX.

Things done

Set the c compiler to the portable name: "cc"

  • 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 requested a review from symphorien July 2, 2020 03:54
@ofborg ofborg bot requested a review from symphorien July 3, 2020 00:05
symphorien
symphorien approved these changes Jul 3, 2020
View reviewed changes
Copy link
Member

@symphorien symphorien left a comment

Choose a reason for hiding this comment

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

Note that https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md requires that you merge your two commits into one. But semantically, I approve.

@fkautz
purple-matrix: set c compiler to cc, fixes build on osx
083772d 
Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
@ofborg ofborg bot requested a review from symphorien July 3, 2020 22:18
@fkautz
Copy link
Member Author

fkautz commented Jul 12, 2020

@symphorien I made the change you requested, should be a simple one to review. :)

@symphorien
Copy link
Member

/marvin opt-in
/status needs_merger

@symphorien
Copy link
Member

hum the bot seems dead, @timokau

@vcunat
Copy link
Member

vcunat commented Jul 12, 2020

@GrahamcOfBorg build purple-matrix

@timokau
Copy link
Member

timokau commented Jul 13, 2020

@symphorien not dead, see timokau/marvin-mk2#68. Also struggling to find available reviewers, hence not assigning anybody recently.

timokau
timokau requested changes Jul 13, 2020
View reviewed changes
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
pname = "purple-matrix-unstable";
version = "2019-06-06";

buildFlags = [ "CC=cc" ];
Copy link
Member

Choose a reason for hiding this comment

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

Please add a comment explaining why this is necessary. People looking at this in the future may not know that this fixes the darwin build, and therefore just remove it (since the linux build works without that line). Or worse, they may never remove it even when it is not necessary anymore because they do not know what it does.

Also it looks like this is something that should get fixed upstream. It would be nice to create an upstream issue/PR and link that in the comment.

@symphorien symphorien closed this Jul 13, 2020
@symphorien symphorien reopened this Jul 13, 2020
@symphorien
Copy link
Member

(sorry mis-manipulation)

vcunat added a commit that referenced this pull request Jul 20, 2020
@vcunat
Merge #91978: purple-matrix: set c compiler to cc
a2bb7bc
@vcunat
Copy link
Member

vcunat commented Jul 20, 2020

I fixed details myself in fc84898. Default platforms don't include darwin, so now we should be also getting binaries.

@vcunat vcunat merged commit 083772d into NixOS:master Jul 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau requested changes

@symphorien symphorien Awaiting requested review from symphorien

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fkautz @symphorien @vcunat @timokau