diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-23 23:43:35 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-23 23:43:35 -0400 |
commit | 0154d513384db6e8dc8c0fce21a6a03abebc4695 (patch) | |
tree | dc8845eb724343ab2359d890a70c7a8b5ac7b164 /pkgs | |
parent | 8f33fb51835324878eb914aa740618b18bc804bc (diff) | |
download | nixpkgs-0154d513384db6e8dc8c0fce21a6a03abebc4695.tar nixpkgs-0154d513384db6e8dc8c0fce21a6a03abebc4695.tar.gz nixpkgs-0154d513384db6e8dc8c0fce21a6a03abebc4695.tar.bz2 nixpkgs-0154d513384db6e8dc8c0fce21a6a03abebc4695.tar.lz nixpkgs-0154d513384db6e8dc8c0fce21a6a03abebc4695.tar.xz nixpkgs-0154d513384db6e8dc8c0fce21a6a03abebc4695.tar.zst nixpkgs-0154d513384db6e8dc8c0fce21a6a03abebc4695.zip |
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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libssh/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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 ]; |