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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,25 @@
|
|||
From c134a83d226fc6b92412ee714bb6c7ab7e3a800f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Sun, 28 Mar 2021 10:25:18 -0500
|
||||
Subject: [PATCH 1/2] Allow external paths default
|
||||
|
||||
---
|
||||
src/kpackage/package.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
|
||||
index 36f5600..881f176 100644
|
||||
--- a/src/kpackage/package.cpp
|
||||
+++ b/src/kpackage/package.cpp
|
||||
@@ -866,7 +866,7 @@ PackagePrivate::PackagePrivate()
|
||||
PackagePrivate::PackagePrivate()
|
||||
: QSharedData()
|
||||
, fallbackPackage(nullptr)
|
||||
- , externalPaths(false)
|
||||
+ , externalPaths(true)
|
||||
, valid(false)
|
||||
, checkedValid(false)
|
||||
{
|
||||
--
|
||||
2.30.1
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From b1c0d2542234247a5051df015d70347597dfe8d8 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Sun, 28 Mar 2021 10:26:40 -0500
|
||||
Subject: [PATCH 2/2] QDirIterator follow symlinks
|
||||
|
||||
---
|
||||
src/kpackage/packageloader.cpp | 2 +-
|
||||
src/kpackage/private/packagejobthread.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
|
||||
index f03d882..d5aee56 100644
|
||||
--- a/src/kpackage/packageloader.cpp
|
||||
+++ b/src/kpackage/packageloader.cpp
|
||||
@@ -196,7 +196,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
|
||||
}
|
||||
|
||||
for (auto const &plugindir : std::as_const(paths)) {
|
||||
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
|
||||
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
|
||||
const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")};
|
||||
|
||||
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
|
||||
--
|
||||
2.30.1
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
mkDerivation,
|
||||
extra-cmake-modules, kdoctools,
|
||||
karchive, kconfig, kcoreaddons, ki18n, qtbase,
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "kpackage";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ];
|
||||
patches = [
|
||||
./0001-Allow-external-paths-default.patch
|
||||
./0002-QDirIterator-follow-symlinks.patch
|
||||
];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue