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

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

Merged
merged 1 commit into from Jul 20, 2020

Conversation

@fkautz
Copy link
Contributor

fkautz commented Jul 2, 2020

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 Jul 3, 2020
Copy link
Contributor

symphorien left a comment

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.

Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
@fkautz fkautz force-pushed the fkautz:fix-purple-matrix-build branch from d000978 to 083772d Jul 3, 2020
@ofborg ofborg bot requested a review from symphorien Jul 3, 2020
@fkautz
Copy link
Contributor Author

fkautz commented Jul 12, 2020

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

@symphorien
Copy link
Contributor

symphorien commented Jul 12, 2020

/marvin opt-in
/status needs_merger

@symphorien
Copy link
Contributor

symphorien commented Jul 12, 2020

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.

@@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
pname = "purple-matrix-unstable";
version = "2019-06-06";

buildFlags = [ "CC=cc" ];

This comment has been minimized.

@timokau

timokau Jul 13, 2020 Member

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
Contributor

symphorien commented Jul 13, 2020

(sorry mis-manipulation)

vcunat added a commit that referenced this pull request Jul 20, 2020
@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
19 checks passed
19 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="083772d"; rev="083772d7eeb0920191fe6d005d5c0e66dcbb2ffc"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="083772d"; rev="083772d7eeb0920191fe6d005d5c0e66dcbb2ffc"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="083772d"; rev="083772d7eeb0920191fe6d005d5c0e66dcbb2ffc"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="083772d"; rev="083772d7eeb0920191fe6d005d5c0e66dcbb2ffc"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="083772d"; rev="083772d7eeb0920191fe6d005d5c0e66dcbb2ffc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="083772d"; rev="083772d7eeb0920191fe6d005d5c0e66dcbb2ffc"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="083772d"; rev="083772d7eeb0920191fe6d005d5c0e66dcbb2ffc"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
purple-matrix on aarch64-linux Success
Details
purple-matrix on x86_64-darwin Success
Details
purple-matrix on x86_64-linux Success
Details
purple-matrix, purple-matrix.passthru.tests on aarch64-linux Success
Details
purple-matrix, purple-matrix.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.