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

perlPackages.NetDBus: fix cross compilation #91134

Merged
merged 1 commit into from Jun 20, 2020
Merged

perlPackages.NetDBus: fix cross compilation #91134

merged 1 commit into from Jun 20, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jun 20, 2020

Make Makefile.PL read the location to the pkgconfig binary from the
PKG_CONFIG environment variable.

Motivation for this change
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.

@flokli flokli added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Jun 20, 2020
@flokli flokli force-pushed the perlpackages-net-dbus-cross branch 2 times, most recently from f5b6a5b to dc469f3 Compare June 20, 2020 00:29
@flokli
Copy link
Contributor Author

flokli commented Jun 20, 2020

There's another build failure before that (in libgpg-error, see #91016), but after a revert of 683004d, perlPackages.NetDBus actually compiles for cross.

@samueldr
Copy link
Member

samueldr commented Jun 20, 2020 •
edited

Note that the change was sent upstream:

@Ericson2314
Copy link
Member

Just need to remove the vendored patch then?

@flokli
perlPackages.NetDBus: fix cross compilation
993ca76 
Make Makefile.PL read the location to the `pkgconfig` binary from the
`PKG_CONFIG` environment variable.
@flokli flokli force-pushed the perlpackages-net-dbus-cross branch from dc469f3 to 993ca76 Compare June 20, 2020 07:51
@flokli
Copy link
Contributor Author

flokli commented Jun 20, 2020

Yeah, I forgot to remove the patch in the repo - the expression already fetchpatches the patch from the upstream PR commit.

@flokli flokli merged commit 3a105d5 into NixOS:master Jun 20, 2020
@flokli flokli deleted the perlpackages-net-dbus-cross branch June 20, 2020 07:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr Awaiting requested review from samueldr

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @samueldr @Ericson2314