Skip to content

Comments

libssh: split headers to "dev" output#231356

Merged
trofi merged 1 commit intoNixOS:stagingfrom
trofi:libssh-dev-output
May 17, 2023
Merged

libssh: split headers to "dev" output#231356
trofi merged 1 commit intoNixOS:stagingfrom
trofi:libssh-dev-output

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented May 11, 2023

Description of changes
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.

@ofborg ofborg bot requested a review from svanderburg May 11, 2023 22:30
@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 11, 2023
@trofi trofi merged commit 090febc into NixOS:staging May 17, 2023
@trofi trofi deleted the libssh-dev-output branch May 17, 2023 06:31
@vcunat
Copy link
Member

vcunat commented May 29, 2023

Apparently cmake has issues detecting this:
https://hydra.nixos.org/build/221540008/nixlog/3/tail

@trofi
Copy link
Contributor Author

trofi commented May 29, 2023

Looking.

@trofi
Copy link
Contributor Author

trofi commented May 29, 2023

Yeah, it's a libssh limitation: it points INTERFACE_INCLUDE_DIRECTORIES to .out, not .dev input:

$ cat /nix/store/rziks5s118dcd2k3c5q8lzlvlgjy718k-libssh-0.10.5-dev/lib/cmake/libssh/libssh-config.cmake
...
# The installation prefix configured by this project.
set(_IMPORT_PREFIX "/nix/store/v7dd8q4mxkycfy7kr71zaiby62lbm1yk-libssh-0.10.5")

# Create imported target ssh
add_library(ssh SHARED IMPORTED)

set_target_properties(ssh PROPERTIES
  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
)

Proposed a revert: #234788

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