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

bat-extras: fix build on Darwin #122069

Merged

Conversation

aaschmid
Copy link
Contributor

@aaschmid aaschmid commented May 7, 2021

Motivation for this change

fix build failure (#119987) on Darwin introduced by #119689

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-build -I nixpkgs=$(pwd) --no-out-link -A bat-extras.batgrep '<nixpkgs>'
  • 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.

@aaschmid aaschmid changed the title bat-extras: fix build on Darwin (#119987) bat-extras: fix build on Darwin May 7, 2021
@aaschmid aaschmid requested a review from lilyball May 7, 2021 18:03
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 7, 2021
@ofborg ofborg bot requested a review from bbigras May 7, 2021 18:32
@r-rmcgibbo
Copy link

r-rmcgibbo commented May 7, 2021

Result of nixpkgs-review pr 122069 at 05358426 run on aarch64-linux 1

5 packages built successfully:
  • bat-extras.batdiff
  • bat-extras.batgrep
  • bat-extras.batman
  • bat-extras.batwatch
  • bat-extras.prettybat

Result of nixpkgs-review pr 122069 at 05358426 run on x86_64-linux 1

5 packages built successfully:
  • bat-extras.batdiff
  • bat-extras.batgrep
  • bat-extras.batman
  • bat-extras.batwatch
  • bat-extras.prettybat

@@ -48,6 +49,7 @@ let

# Run the library tests as they don't have external dependencies
doCheck = true;
checkInputs = [ getconf ];
Copy link
Member

Choose a reason for hiding this comment

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

This should be behind lib.optionals.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You mean that we just set it on Darwin? I though to keep it always as it is definitively required on both, however somehow included in linux stdenv or somewhat else ...

Copy link
Member

Choose a reason for hiding this comment

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

I think it is included in glibc for linux. Darwin uses clang so it is not included there. Maybe we want to build it with gccStdenv instead. If not please put it behind stdenv.isDarwin just to be sure.

introduced by NixOS#119689

Signed-off-by: Andreas Schmid <service@aaschmid.de>
@aaschmid aaschmid force-pushed the fix.bat-extras.build.on.darwin branch from 0535842 to 9f050c6 Compare May 8, 2021 20:08
@SuperSandro2000 SuperSandro2000 merged commit bac882f into NixOS:master May 10, 2021
@aaschmid aaschmid deleted the fix.bat-extras.build.on.darwin branch May 10, 2021 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants