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

pkgsStatic: override libunwind #65537

Merged
merged 1 commit into from Aug 13, 2019
Merged

pkgsStatic: override libunwind #65537

merged 1 commit into from Aug 13, 2019

Conversation

lukateras
Copy link
Member

Motivation for this change

Adds static override to LLVM libunwind. Try:

nix build nixpkgs.pkgsStatic.llvmPackages_8.libraries.libunwind
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@@ -1,4 +1,4 @@
{ stdenv, version, fetch, cmake, fetchpatch }:
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
Copy link
Contributor

Choose a reason for hiding this comment

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

The modified stdenv for pkgsStatic was recently extended to carry a static flag, this can be used for the default argument, making the explicit override in the static overlay unnecessary.

Suggested change
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? !(lib.hasAttr "static" stdenv) }:

You could even take it one step further and remove enableShared and check the implicit parameter in the cmakeFlags directly.

Copy link
Member

Choose a reason for hiding this comment

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

We definitely want these to be overridable, so providing enableShared is important.

Copy link
Contributor

Choose a reason for hiding this comment

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

Do we? What is the use case for specifying this at individual package granularity?

Copy link
Member

Choose a reason for hiding this comment

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

Perhaps it's not so important. Some users might want to fine tune which packages are static and which are shared (in some cases like kerberos, no static version is available). It's nice to have a specific flag for this, although you can always just override the stdenv being used.

@tobim
Copy link
Contributor

tobim commented Aug 7, 2019

cc @matthewbauer

@matthewbauer matthewbauer merged commit 554a789 into NixOS:master Aug 13, 2019
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

3 participants