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
55
pkgs/development/libraries/grantlee/5/default.nix
Normal file
55
pkgs/development/libraries/grantlee/5/default.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, qtbase, qtscript, cmake }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "grantlee";
|
||||
version = "5.2.0";
|
||||
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "steveire";
|
||||
repo = "grantlee";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtscript ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
patches = [
|
||||
./grantlee-nix-profiles.patch
|
||||
./grantlee-no-canonicalize-filepath.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
postFixup =
|
||||
# Disabuse CMake of the notion that libraries are in $dev
|
||||
''
|
||||
for way in release debug; do
|
||||
cmake="$dev/lib/cmake/Grantlee5/GrantleeTargets-$way.cmake"
|
||||
if [ -f "$cmake" ]; then
|
||||
sed -i "$cmake" -e "s|\''${_IMPORT_PREFIX}|$out|"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
doCheck = false; # fails all the tests (ctest)
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt5 port of Django template system";
|
||||
longDescription = ''
|
||||
Grantlee is a plugin based String Template system written using the Qt
|
||||
framework. The goals of the project are to make it easier for application
|
||||
developers to separate the structure of documents from the data they
|
||||
contain, opening the door for theming.
|
||||
|
||||
The syntax is intended to follow the syntax of the Django template system,
|
||||
and the design of Django is reused in Grantlee.'';
|
||||
|
||||
homepage = "https://github.com/steveire/grantlee";
|
||||
maintainers = [ maintainers.ttuegel ];
|
||||
license = licenses.lgpl21;
|
||||
inherit (qtbase.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
Index: grantlee-5.1.0/templates/lib/engine.cpp
|
||||
===================================================================
|
||||
--- grantlee-5.1.0.orig/templates/lib/engine.cpp
|
||||
+++ grantlee-5.1.0/templates/lib/engine.cpp
|
||||
@@ -48,6 +48,14 @@ Engine::Engine(QObject *parent)
|
||||
|
||||
d_ptr->m_pluginDirs = QCoreApplication::instance()->libraryPaths();
|
||||
d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH);
|
||||
+
|
||||
+ // Add library paths derived from NIX_PROFILES.
|
||||
+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
|
||||
+ for (const QByteArray &profile: profiles) {
|
||||
+ if (!profile.isEmpty()) {
|
||||
+ d_ptr->m_pluginDirs << (QFile::decodeName(profile) + QStringLiteral("/lib"));
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
Engine::~Engine()
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
Index: grantlee-5.1.0/templates/lib/templateloader.cpp
|
||||
===================================================================
|
||||
--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp
|
||||
+++ grantlee-5.1.0/templates/lib/templateloader.cpp
|
||||
@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName,
|
||||
+ QLatin1Char('/') + fileName);
|
||||
const QFileInfo fi(file);
|
||||
|
||||
- if (file.exists()
|
||||
- && !fi.canonicalFilePath().contains(
|
||||
- QDir(d->m_templateDirs.at(i)).canonicalPath()))
|
||||
- return Template();
|
||||
++i;
|
||||
}
|
||||
|
||||
@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co
|
||||
+ QLatin1Char('/') + fileName);
|
||||
|
||||
const QFileInfo fi(file);
|
||||
- if (!fi.canonicalFilePath().contains(
|
||||
- QDir(d->m_templateDirs.at(i)).canonicalPath())) {
|
||||
- ++i;
|
||||
- continue;
|
||||
- }
|
||||
|
||||
if (file.exists()) {
|
||||
auto path = fi.absoluteFilePath();
|
||||
13
pkgs/development/libraries/grantlee/5/setup-hook.sh
Normal file
13
pkgs/development/libraries/grantlee/5/setup-hook.sh
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
grantleePluginPrefix=@grantleePluginPrefix@
|
||||
|
||||
providesGrantleeRuntime() {
|
||||
[ -d "$1/$grantleePluginPrefix" ]
|
||||
}
|
||||
|
||||
_grantleeEnvHook() {
|
||||
if providesGrantleeRuntime "$1"; then
|
||||
propagatedBuildInputs+=" $1"
|
||||
propagatedUserEnvPkgs+=" $1"
|
||||
fi
|
||||
}
|
||||
addEnvHooks "$hostOffset" _grantleeEnvHook
|
||||
Loading…
Add table
Add a link
Reference in a new issue