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,62 @@
{ lib
, stdenv
, libsigrok
, toPythonModule
, python
, autoreconfHook
, pythonImportsCheckHook
, pythonCatchConflictsHook
, swig
, setuptools
, numpy
, pygobject3
}:
# build libsigrok plus its Python bindings. Unfortunately it does not appear
# to be possible to build them separately, at least not easily.
toPythonModule ((libsigrok.override {
inherit python;
}).overrideAttrs (orig: {
pname = "${python.libPrefix}-sigrok";
patches = orig.patches or [] ++ [
# Makes libsigrok install the bindings into site-packages properly (like
# we expect) instead of making a version-specific *.egg subdirectory.
./python-install.patch
];
nativeBuildInputs = orig.nativeBuildInputs or [] ++ [
autoreconfHook
setuptools
swig
numpy
] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
pythonImportsCheckHook
pythonCatchConflictsHook
];
buildInputs = orig.buildInputs or [] ++ [
pygobject3 # makes headers available the configure script checks for
];
propagatedBuildInputs = orig.propagatedBuildInputs or [] ++ [
pygobject3
numpy
];
postInstall = ''
${orig.postInstall or ""}
# for pythonImportsCheck
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
'';
pythonImportsCheck = [ "sigrok" "sigrok.core" ];
meta = orig.meta // {
description = "Python bindings for libsigrok";
maintainers = orig.meta.maintainers ++ [
lib.maintainers.sternenseemann
];
};
}))

View file

@ -0,0 +1,16 @@
diff --git a/Makefile.am b/Makefile.am
index 280cf64d..e10eb79f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -888,8 +888,9 @@ $(PDIR)/timestamp: $(PDIR)/sigrok/core/classes.i \
python-install:
$(AM_V_at)$(MKDIR_P) "$(DESTDIR)$(prefix)" "$(DESTDIR)$(exec_prefix)"
- destdir='$(DESTDIR)'; $(setup_py) install $${destdir:+"--root=$$destdir"} \
- --prefix "$(prefix)" --exec-prefix "$(exec_prefix)"
+ destdir='$(DESTDIR)'; $(setup_py) install --root=$${destdir:-/} \
+ --prefix "$(prefix)" --exec-prefix "$(exec_prefix)" \
+ --single-version-externally-managed
python-clean:
-$(AM_V_at)rm -f $(PDIR)/timestamp