diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
commit | 5487bcdfdd2c750274761263f3d65c00d7f6897b (patch) | |
tree | 6584bf52d6b70a59e10cd8eef51280f42ad2afa8 /pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch | |
parent | 8b9edf1e0fa01a9de7db6ead1b7b28f23b91b3e2 (diff) | |
parent | 1623d81e507520b5207307bc2bf8cfcddf90944a (diff) | |
download | nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.gz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.bz2 nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.lz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.xz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.zst nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.zip |
Rebase onto 236cc2971ac72acd90f0ae3a797f9f83098b17ec
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch')
-rw-r--r-- | pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch b/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch new file mode 100644 index 00000000000..ad2186543f3 --- /dev/null +++ b/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch @@ -0,0 +1,37 @@ +From 52ab2095649b5951e6af77f68954209473296983 Mon Sep 17 00:00:00 2001 +From: Sandro <sandro.jaeckel@gmail.com> +Date: Sat, 16 Jan 2021 15:54:05 +0100 +Subject: [PATCH] Fix finding apple libraries + +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + + +(rejected by upstream in https://github.com/Azure/azure-c-shared-utility/pull/499, +seems problem it's solving is nixpkgs-specific) + +diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt +index 7bbfa6f3f..3567b18bc 100644 +--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt ++++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt +@@ -120,8 +120,9 @@ endif() + + if(${use_applessl}) + # MACOSX only has native tls and open ssl, so use the native apple tls +- find_library(cf_foundation Foundation) ++ find_library(cf_foundation CoreFoundation) + find_library(cf_network CFNetwork) ++ find_library(cf_security Security) + endif() + + if(${no_logging}) +@@ -581,7 +582,7 @@ endif() + + + if(${use_applessl}) +- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network}) ++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network} ${cf_security}) + endif() + + if(WIN32) |