Skip to content

libssh: fix build with newer clang#234219

Merged
wegank merged 1 commit intoNixOS:stagingfrom
reckenrode:libssh-darwin-stdenv-fix
May 26, 2023
Merged

libssh: fix build with newer clang#234219
wegank merged 1 commit intoNixOS:stagingfrom
reckenrode:libssh-darwin-stdenv-fix

Conversation

@reckenrode
Copy link
Contributor

Description of changes

One of the examples attempts to use x11_connect_display, but libX11 is not included in the buildInputs. Since the examples are not actually included in any of the outputs, just disable them to avoid taking a libX11 dependency.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

One of the examples attempts to use `x11_connect_display`, but libX11 is
not included in the `buildInputs`. Since the examples are not actually
included in any of the outputs, just disable them to avoid taking a
libX11 dependency.
@ofborg ofborg bot requested a review from svanderburg May 26, 2023 14:20
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels May 26, 2023
@wegank wegank merged commit 239790c into NixOS:staging May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments