dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libssh: split outputs

Browse Source
This commit is contained in:
Robert Schütz 2024-09-18 19:55:19 -07:00
parent 1fd4a81e1b
commit 0b3382016a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/libssh/default.nix
View File

@ -22,11 +22,7 @@ stdenv.mkDerivation rec {
hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k="; hash = "sha256-FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k=";
}; };
# Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake outputs = [ "out" "dev" ];
# is fixed to point INTERFACE_INCLUDE_DIRECTORIES to .dev output.
# Otherwise it breaks `plasma5Packages.kio-extras`:
# https://hydra.nixos.org/build/221540008/nixlog/3/tail
#outputs = [ "out" "dev" ];
postPatch = '' postPatch = ''
# Fix headers to use libsodium instead of NaCl # Fix headers to use libsodium instead of NaCl
@ -37,13 +33,15 @@ stdenv.mkDerivation rec {
# included in `buildInputs` such as libX11. # included in `buildInputs` such as libX11.
cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ]; cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ];
# single output, otherwise cmake and .pc files point to the wrong directory
# outputs = [ "out" "dev" ];
buildInputs = [ zlib openssl libsodium ]; buildInputs = [ zlib openssl libsodium ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
postFixup = ''
substituteInPlace $dev/lib/cmake/libssh/libssh-config.cmake \
--replace-fail "set(_IMPORT_PREFIX \"$out\")" "set(_IMPORT_PREFIX \"$dev\")"
'';
passthru.tests = { passthru.tests = {
inherit ffmpeg sshping wireshark; inherit ffmpeg sshping wireshark;
}; };