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

ansifilter: extend build to include Darwin #91532

Merged
merged 1 commit into from Jul 1, 2020
Merged

Conversation

@shajra
Copy link
Contributor

shajra commented Jun 26, 2020

All that was required was to use clang++ instead of g++ when compiling for
Darwin.

Motivation for this change

It seemed like a small utility that should be buildable for Macs, and it turned out to be possible to support without much of a hack.

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.
postPatch = if !stdenv.isDarwin then "" else ''
substituteInPlace src/makefile --replace CC=g++ CC=clang++
'';
Comment on lines 15 to 17

This comment has been minimized.

@danieldk

danieldk Jun 26, 2020 Member

This can be made more generic with:

Suggested change
postPatch = if !stdenv.isDarwin then "" else ''
substituteInPlace src/makefile --replace CC=g++ CC=clang++
'';
postPatch = ''
substituteInPlace src/makefile --replace "CC=g++" "CC=c++"
'';

This has the added benefit that it would also work on Linux with another C++ compiler (e.g. clang++).

This comment has been minimized.

@shajra

shajra Jun 27, 2020 Author Contributor

I could have just done the new "commit suggestion" feature, but instead I just force-pushed the exact same change to the branch.

@danieldk I tested this on both my Linux and Mac laptops. It works fine. Can you re-review this (and hopefully approve it)?

Thanks.

@shajra shajra force-pushed the shajra:fix/ansifilter branch from a0779ee to 253235d Jun 27, 2020
All that was required was to use clang++ instead of g++ when compiling for
Darwin.
@shajra shajra force-pushed the shajra:fix/ansifilter branch from 253235d to 56f1949 Jun 27, 2020
@LnL7
LnL7 approved these changes Jul 1, 2020
@LnL7 LnL7 merged commit 730f86b into NixOS:master Jul 1, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
ansifilter, ansifilter.passthru.tests on aarch64-linux Success
Details
ansifilter, ansifilter.passthru.tests on x86_64-linux Success
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="56f1949"; rev="56f19490924ac25df63f486759d2e534a1955d39"; } ./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="56f1949"; rev="56f19490924ac25df63f486759d2e534a1955d39"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="56f1949"; rev="56f19490924ac25df63f486759d2e534a1955d39"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="56f1949"; rev="56f19490924ac25df63f486759d2e534a1955d39"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="56f1949"; rev="56f19490924ac25df63f486759d2e534a1955d39"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="56f1949"; rev="56f19490924ac25df63f486759d2e534a1955d39"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="56f1949"; rev="56f19490924ac25df63f486759d2e534a1955d39"; } ./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
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

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