From 0154d513384db6e8dc8c0fce21a6a03abebc4695 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 23 Apr 2019 23:43:35 -0400 Subject: libssh: don't use multiple outputs Makes cmake files point to the correct output for libs and corrects the Cflags in the .pc file. Fixes #60036 --- pkgs/development/libraries/libssh/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 4d293e6fb39..fe7bc094fdc 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c ''; - outputs = [ "out" "dev" ]; + # single output, otherwise cmake and .pc files point to the wrong directory + # outputs = [ "out" "dev" ]; buildInputs = [ zlib openssl libsodium ]; -- cgit 1.4.1