uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -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)

View file

@ -0,0 +1,76 @@
{ lib
, stdenv
, buildPythonPackage
, certifi
, CFNetwork
, cmake
, CoreFoundation
, enum34
, fetchpatch
, fetchPypi
, isPy3k
, openssl
, Security
, six
}:
buildPythonPackage rec {
pname = "uamqp";
version = "1.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs=";
};
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
./darwin-azure-c-shared-utility-corefoundation.patch
];
postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) ''
# force darwin aarch64 to use openssl instead of applessl, removing
# some quirks upstream thinks they need to use openssl on macos
sed -i \
-e '/^use_openssl =/cuse_openssl = True' \
-e 's/\bazssl\b/ssl/' \
-e 's/\bazcrypto\b/crypto/' \
setup.py
sed -i \
-e '/#define EVP_PKEY_id/d' \
src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c
'';
nativeBuildInputs = [
cmake
];
buildInputs = lib.optionals stdenv.isDarwin [
CoreFoundation
CFNetwork
Security
];
propagatedBuildInputs = [
certifi
openssl
six
] ++ lib.optionals (!isPy3k) [
enum34
];
dontUseCmakeConfigure = true;
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"uamqp"
];
meta = with lib; {
description = "An AMQP 1.0 client library for Python";
homepage = "https://github.com/Azure/azure-uamqp-python";
license = licenses.mit;
maintainers = with maintainers; [ maxwilson ];
};
}