summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2023-05-29 11:53:14 +0100
committerSergei Trofimovich <slyich@gmail.com>2023-05-29 11:53:14 +0100
commit853461b6c8d6926110414b7f7d8633d76b530e2d (patch)
tree4a0b9928bbf7923730c3827525a33c802faef1ae
parent2f9191eb88a2a61169efd47dee019ca6996a5a1d (diff)
downloadnixpkgs-853461b6c8d6926110414b7f7d8633d76b530e2d.tar
nixpkgs-853461b6c8d6926110414b7f7d8633d76b530e2d.tar.gz
nixpkgs-853461b6c8d6926110414b7f7d8633d76b530e2d.tar.bz2
nixpkgs-853461b6c8d6926110414b7f7d8633d76b530e2d.tar.lz
nixpkgs-853461b6c8d6926110414b7f7d8633d76b530e2d.tar.xz
nixpkgs-853461b6c8d6926110414b7f7d8633d76b530e2d.tar.zst
nixpkgs-853461b6c8d6926110414b7f7d8633d76b530e2d.zip
libssh: revert "dev" output split
Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake
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
-rw-r--r--pkgs/development/libraries/libssh/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 464aeb817cc..737ee55d41a 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -22,7 +22,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-tg4v9/Nnue7itWNNOmMwPd/t4OahjfyojESodw5+QjQ=";
   };
 
-  outputs = [ "out" "dev" ];
+  # Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake
+  # 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 = ''
     # Fix headers to use libsodium instead of NaCl