diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-09-13 17:52:45 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-10-13 13:01:20 -0700 |
| commit | 74f7adf0be941e8e126532e1cc6f5202f7278c60 (patch) | |
| tree | 7278844f183e93cbd162856257dad8585c127135 | |
| parent | 4250a64798a900f66f5677a18535213ebdad118e (diff) | |
| download | nixpkgs-74f7adf0be941e8e126532e1cc6f5202f7278c60.tar nixpkgs-74f7adf0be941e8e126532e1cc6f5202f7278c60.tar.gz nixpkgs-74f7adf0be941e8e126532e1cc6f5202f7278c60.tar.bz2 nixpkgs-74f7adf0be941e8e126532e1cc6f5202f7278c60.tar.lz nixpkgs-74f7adf0be941e8e126532e1cc6f5202f7278c60.tar.xz nixpkgs-74f7adf0be941e8e126532e1cc6f5202f7278c60.tar.zst nixpkgs-74f7adf0be941e8e126532e1cc6f5202f7278c60.zip | |
c-ares: remove passthru.cmake-config
| -rw-r--r-- | pkgs/development/libraries/c-ares/default.nix | 31 | ||||
| -rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 2 |
2 files changed, 2 insertions, 31 deletions
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index a7538a2615d..23229fd3a1f 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -8,7 +8,6 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -let self = stdenv.mkDerivation rec { pname = "c-ares"; version = "1.18.1"; @@ -38,32 +37,4 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; - - # Adapted from running a cmake build - passthru.cmake-config = let - extension = if stdenv.hostPlatform.isStatic then ".a" else stdenv.hostPlatform.extensions.sharedLibrary; - buildType = if stdenv.hostPlatform.isStatic then "STATIC" else "SHARED"; - buildTypeLower = if stdenv.hostPlatform.isStatic then "static" else "shared"; - in writeTextDir "c-ares-config.cmake" - '' - set(c-ares_INCLUDE_DIR "${self}/include") - - set(c-ares_LIBRARY c-ares::cares) - - add_library(c-ares::cares ${buildType} IMPORTED) - - set_target_properties(c-ares::cares PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${self}/include" - ${lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''} - ) - set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(c-ares::cares PROPERTIES - IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${extension}" - IMPORTED_SONAME_RELEASE "libcares${extension}" - ) - add_library(c-ares::cares_${buildTypeLower} INTERFACE IMPORTED) - set_target_properties(c-ares::cares_${buildTypeLower} PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") - set(c-ares_${buildType}_LIBRARY c-ares::cares_${buildTypeLower}) - ''; - -}; in self +} diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 4cba9c1b511..d44b85337dd 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) grpc; propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; - buildInputs = [ c-ares.cmake-config openssl protobuf ] + buildInputs = [ openssl protobuf ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ |