Unverified Commit 9799bd4b authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #234788: libssh: revert "dev" output split 

...into staging-next
parents 1baa1734 853461b6

pkgs/development/libraries/libssh/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -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