bump pytapo, add libedgetpu
This commit is contained in:
parent
6b29f58343
commit
c38e197482
|
@ -13,4 +13,6 @@ self: super: {
|
||||||
studio-link = super.callPackage ./studio-link.nix { };
|
studio-link = super.callPackage ./studio-link.nix { };
|
||||||
|
|
||||||
nginxModules = super.recurseIntoAttrs (super.callPackage ./nginx/modules.nix { });
|
nginxModules = super.recurseIntoAttrs (super.callPackage ./nginx/modules.nix { });
|
||||||
|
|
||||||
|
libedgetpu = self.callPackage ./libedgetpu {};
|
||||||
}
|
}
|
68
libedgetpu/default.nix
Normal file
68
libedgetpu/default.nix
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, libusb1
|
||||||
|
, abseil-cpp
|
||||||
|
, flatbuffers
|
||||||
|
, xxd
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
flatbuffers_1_12 = flatbuffers.overrideAttrs (oldAttrs: rec {
|
||||||
|
version = "1.12.0";
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=maybe-uninitialized";
|
||||||
|
cmakeFlags = (oldAttrs.cmakeFlags or []) ++ ["-DFLATBUFFERS_BUILD_SHAREDLIB=ON"];
|
||||||
|
NIX_CXXSTDLIB_COMPILE = "-std=c++17";
|
||||||
|
configureFlags = (oldAttrs.configureFlags or []) ++ ["--enable-shared"];
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "google";
|
||||||
|
repo = "flatbuffers";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg=";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
|
pname = "libedgetpu";
|
||||||
|
version = "grouper";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "google-coral";
|
||||||
|
repo = pname;
|
||||||
|
rev = "release-${version}";
|
||||||
|
sha256 = "sha256-73hwItimf88Iqnb40lk4ul/PzmCNIfdt6Afi+xjNiBE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./libedgetpu-stddef.diff ];
|
||||||
|
|
||||||
|
makeFlags = ["-f" "makefile_build/Makefile" "libedgetpu" ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
libusb1
|
||||||
|
abseil-cpp
|
||||||
|
flatbuffers_1_12
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
xxd
|
||||||
|
];
|
||||||
|
|
||||||
|
NIX_CXXSTDLIB_COMPILE = "-std=c++17";
|
||||||
|
|
||||||
|
TFROOT = "${fetchFromGitHub {
|
||||||
|
owner = "tensorflow";
|
||||||
|
repo = "tensorflow";
|
||||||
|
rev = "v2.7.4";
|
||||||
|
sha256 = "sha256-liDbUAdaVllB0b74aBeqNxkYNu/zPy7k3CevzRF5dk0=";
|
||||||
|
}}";
|
||||||
|
|
||||||
|
enableParallelBuilding = false;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/lib
|
||||||
|
cp out/direct/k8/libedgetpu.so.1.0 $out/lib
|
||||||
|
ln -s $out/lib/libedgetpu.so.1.0 $out/lib/libedgetpu.so.1
|
||||||
|
mkdir -p $out/lib/udev/rules.d
|
||||||
|
cp debian/edgetpu-accelerator.rules $out/lib/udev/rules.d/99-edgetpu-accelerator.rules
|
||||||
|
'';
|
||||||
|
}
|
12
libedgetpu/libedgetpu-stddef.diff
Normal file
12
libedgetpu/libedgetpu-stddef.diff
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/api/allocated_buffer.h b/api/allocated_buffer.h
|
||||||
|
index 97740f0..7bc0547 100644
|
||||||
|
--- a/api/allocated_buffer.h
|
||||||
|
+++ b/api/allocated_buffer.h
|
||||||
|
@@ -16,6 +16,7 @@
|
||||||
|
#define DARWINN_API_ALLOCATED_BUFFER_H_
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
|
+#include <cstddef>
|
||||||
|
|
||||||
|
namespace platforms {
|
||||||
|
namespace darwinn {
|
|
@ -12,14 +12,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytapo";
|
pname = "pytapo";
|
||||||
version = "3.2.18";
|
version = "3.3.16";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-z3HD7sjDg8dMNpd93PiN+nSzKTVCw+OJnfKX07e1+sg=";
|
hash = "sha256-omeJUF4bY/FfXMmBvpVo3dr7B/pUy8YXt0DPaSe3VkA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue