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

stdenv/darwin: allow brotli reference from curl #115498

Merged
merged 1 commit into from Mar 12, 2021

Conversation

thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Mar 9, 2021

Brotli is recently a default dependency of curl in nixpkgs.

See e3d1967 in #112947

Motivation for this change

Fix darwin stdenv build.

Stage 2 now references brotli:

$ nix why-depends --all /nix/store/4x2440ns4gzyknaa70lzrk832vsn3djv-bootstrap-stage2-stdenv-darwin   /nix/store/qvv2xw5da22lfgbj1zq4hhvh286i74f7-brotli-1.0.9-lib
/nix/store/4x2440ns4gzyknaa70lzrk832vsn3djv-bootstrap-stage2-stdenv-darwin
╚═══setup: ….defaultBuildInputs="/nix/store/irylbhn1qz80fyqlcjcxl0jaqm2yr328-swift-corefoundation".# Don't p…
    => /nix/store/irylbhn1qz80fyqlcjcxl0jaqm2yr328-swift-corefoundation
    ╚═══Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation: ….h.................../nix/store/1ycixpvd73ys8lzpkf2562pdxz5dxfp6-curl-7.74.0/lib/libcurl.4.dylib…
        => /nix/store/1ycixpvd73ys8lzpkf2562pdxz5dxfp6-curl-7.74.0
        ╚═══lib/libcurl.4.dylib: ….p.................../nix/store/qvv2xw5da22lfgbj1zq4hhvh286i74f7-brotli-1.0.9-lib/lib/libbrotlid…
            => /nix/store/qvv2xw5da22lfgbj1zq4hhvh286i74f7-brotli-1.0.9-lib

Comparing master and this branch (shameless plug for my stdenv analyser), the new builds by stage are:

  • libidn-1.36.drv at stages 1 and 4
  • brotli-1.0.9.drv at stages 1 and 4

And libidn doesn't appear in the closure of curl, so can be omitted here.

This isn't the only solution, we could use curlMinimal in stage1 .

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.

Brotli is recently a default dependency of curl in nixpkgs.

See e3d1967 in NixOS#112947
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 6.topic: stdenv Standard environment labels Mar 9, 2021
@thefloweringash thefloweringash marked this pull request as ready for review March 9, 2021 10:06
@thefloweringash thefloweringash mentioned this pull request Mar 11, 2021
10 tasks
@mweinelt mweinelt merged commit 91b3ede into NixOS:staging-next Mar 12, 2021
@thefloweringash thefloweringash deleted the stdenv-darwin-brotli branch March 12, 2021 03:28
@SuperSandro2000 SuperSandro2000 mentioned this pull request Mar 13, 2021
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants