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

Jump to bottom

p11-kit: Add libtasn1 to nativeBuildInputs #96868

Merged
merged 1 commit into from Sep 1, 2020
Merged

p11-kit: Add libtasn1 to nativeBuildInputs #96868

merged 1 commit into from Sep 1, 2020

Conversation

kampka
Copy link
Contributor

@kampka kampka commented Aug 31, 2020

Motivation for this change

For cross platform builds of p11-kit, libtasn1 in nativeBuildInputs
provides the asn1Parser binary on the hostPlatform needed for building.
At the same time, libtasn1 in buildInputs provides the libasn1 library
to link against for the target platform.
Hence, libtasn1 is required in both native and build inputs.

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.

@kampka kampka added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Aug 31, 2020
@kampka kampka changed the base branch from master to staging August 31, 2020 20:01
@kampka
Copy link
Contributor Author

kampka commented Aug 31, 2020 •
edited

@GrahamcOfBorg build p11-kit
@GrahamcOfBorg build pkgsCross.aarch64-multiplatform.p11-kit

@jonringer
Copy link
Contributor

jonringer commented Aug 31, 2020 •
edited

do you mind rebasing on top of the latest master? You checked out a commit in the 10mins in which I accidentally broke it :(

specifically:

error: while querying the derivation named 'check-esxi-hardware-20181001':
while evaluating the attribute 'out.outPath' at /home/jon/.cache/nixpkgs-review/pr-96868/nixpkgs/lib/customisation.nix:156:13:
while evaluating the attribute 'propagatedBuildInputs' of the derivation 'check-esxi-hardware-20181001' at /home/jon/.cache/nixpkgs-review/pr-96868/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix:108:5:
while evaluating 'getOutput' at /home/jon/.cache/nixpkgs-review/pr-96868/nixpkgs/lib/attrsets.nix:464:23, called from undefined position:
while evaluating anonymous function at /home/jon/.cache/nixpkgs-review/pr-96868/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:157:17, called from undefined position:
undefined variable 'pywbem' at /home/jon/.cache/nixpkgs-review/pr-96868/nixpkgs/pkgs/servers/monitoring/plugins/esxi.nix:30:51

@kampka
Copy link
Contributor Author

kampka commented Aug 31, 2020

do you mind rebasing on top of the latest master?

This PR is actually targeted against staging as it will cause a couple thousand packages to rebuild I think.
As such, it is up to date, but I can base it against master if that makes more sense.

@jonringer
Copy link
Contributor

oh sorry, do you mind rebasing on the latest target branch? xD

@kampka
Copy link
Contributor Author

kampka commented Aug 31, 2020 •
edited

oh sorry, do you mind rebasing on the latest target branch? xD

Not at all, but someone would have to run the whole master -> staging-next -> staging operation first, I think.
Currently, this branch is up to date, so I'll rebase as soon as that happens.

jonringer
jonringer approved these changes Aug 31, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM

I don't think this will cause any issues

@kampka
p11-kit: Add libtasn1 to nativeBuildInputs
ca48f0c 
For cross platform builds, p11-kit, libtasn1 in nativeBuildInputs
provides the asn1Parser binary on the hostPlatform needed for building.
At the same time, libtasn1 in buildInputs provides the libasn1 library
to link against for the target platform.
Hence, libtasn1 is required in both native and build inputs.
@vcunat vcunat merged commit eccb4f2 into NixOS:staging Sep 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@ttuegel ttuegel Awaiting requested review from ttuegel

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
2.status: merge conflict 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 6.topic: python 6.topic: qt/kde 8.has: documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kampka @jonringer @vcunat