kde_applications: 17.12.3 -> 18.04.0
This commit is contained in:
parent
b933157f44
commit
faed183206
@ -1,8 +1,40 @@
|
|||||||
Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
|
||||||
===================================================================
|
index 2e9f1acf4..ecc80afdc 100644
|
||||||
--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
|
--- a/src/akonadicontrol/agentmanager.cpp
|
||||||
+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
+++ b/src/akonadicontrol/agentmanager.cpp
|
||||||
@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett
|
@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
|
||||||
|
mStorageController = new Akonadi::ProcessControl;
|
||||||
|
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
|
||||||
|
connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
|
||||||
|
- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
||||||
|
+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
||||||
|
|
||||||
|
if (mAgentServerEnabled) {
|
||||||
|
mAgentServer = new Akonadi::ProcessControl;
|
||||||
|
connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
|
||||||
|
- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
||||||
|
+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef QT_NO_DEBUG
|
||||||
|
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
|
||||||
|
index be1cc4afb..6d0c1d7e5 100644
|
||||||
|
--- a/src/akonadicontrol/agentprocessinstance.cpp
|
||||||
|
+++ b/src/akonadicontrol/agentprocessinstance.cpp
|
||||||
|
@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
|
||||||
|
} else {
|
||||||
|
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
|
||||||
|
const QStringList arguments = QStringList() << executable << identifier();
|
||||||
|
- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher"));
|
||||||
|
+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
|
||||||
|
mController->start(agentLauncherExec, arguments);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
|
||||||
|
index a32e86602..48ea4e52e 100644
|
||||||
|
--- a/src/server/storage/dbconfigmysql.cpp
|
||||||
|
+++ b/src/server/storage/dbconfigmysql.cpp
|
||||||
|
@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings)
|
||||||
// determine default settings depending on the driver
|
// determine default settings depending on the driver
|
||||||
QString defaultHostName;
|
QString defaultHostName;
|
||||||
QString defaultOptions;
|
QString defaultOptions;
|
||||||
@ -10,7 +42,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
|||||||
QString defaultCleanShutdownCommand;
|
QString defaultCleanShutdownCommand;
|
||||||
|
|
||||||
#ifndef Q_OS_WIN
|
#ifndef Q_OS_WIN
|
||||||
@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett
|
@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const bool defaultInternalServer = true;
|
const bool defaultInternalServer = true;
|
||||||
@ -29,28 +61,28 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
|||||||
- << QStringLiteral("/opt/local/lib/mysql5/bin")
|
- << QStringLiteral("/opt/local/lib/mysql5/bin")
|
||||||
- << QStringLiteral("/opt/mysql/sbin");
|
- << QStringLiteral("/opt/mysql/sbin");
|
||||||
- if (defaultServerPath.isEmpty()) {
|
- if (defaultServerPath.isEmpty()) {
|
||||||
- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath);
|
- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath);
|
||||||
- }
|
- }
|
||||||
|
-
|
||||||
- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
|
- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath);
|
||||||
+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
|
+ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
|
||||||
if (!mysqladminPath.isEmpty()) {
|
if (!mysqladminPath.isEmpty()) {
|
||||||
#ifndef Q_OS_WIN
|
#ifndef Q_OS_WIN
|
||||||
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
|
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
|
||||||
@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett
|
@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
|
- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath);
|
||||||
+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
|
+ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
|
||||||
qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
|
qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
|
||||||
|
|
||||||
- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
|
- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath);
|
||||||
+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
|
+ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
|
||||||
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
|
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
|
||||||
|
|
||||||
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
|
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
|
||||||
@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett
|
@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings)
|
||||||
mUserName = settings.value(QStringLiteral("User")).toString();
|
mUserName = settings.value(QStringLiteral("User")).toString();
|
||||||
mPassword = settings.value(QStringLiteral("Password")).toString();
|
mPassword = settings.value(QStringLiteral("Password")).toString();
|
||||||
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
|
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
|
||||||
@ -59,7 +91,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
|||||||
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
|
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
|
|
||||||
@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett
|
@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings)
|
||||||
// intentionally not namespaced as we are the only one in this db instance when using internal mode
|
// intentionally not namespaced as we are the only one in this db instance when using internal mode
|
||||||
mDatabaseName = QStringLiteral("akonadi");
|
mDatabaseName = QStringLiteral("akonadi");
|
||||||
}
|
}
|
||||||
@ -69,7 +101,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
|||||||
|
|
||||||
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
|
qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
|
||||||
|
|
||||||
@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett
|
@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings)
|
||||||
settings.setValue(QStringLiteral("Name"), mDatabaseName);
|
settings.setValue(QStringLiteral("Name"), mDatabaseName);
|
||||||
settings.setValue(QStringLiteral("Host"), mHostName);
|
settings.setValue(QStringLiteral("Host"), mHostName);
|
||||||
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
|
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
|
||||||
@ -79,20 +111,20 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
|
|||||||
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
|
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
settings.sync();
|
settings.sync();
|
||||||
@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer(
|
@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// generate config file
|
// generate config file
|
||||||
- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
|
- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
|
||||||
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
|
+ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
|
||||||
const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
|
const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
|
||||||
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
|
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
|
||||||
if (globalConfig.isEmpty()) {
|
if (globalConfig.isEmpty()) {
|
||||||
Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
|
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
|
||||||
===================================================================
|
index 60e6272f2..ad7cefbfe 100644
|
||||||
--- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp
|
--- a/src/server/storage/dbconfigpostgresql.cpp
|
||||||
+++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
|
+++ b/src/server/storage/dbconfigpostgresql.cpp
|
||||||
@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings
|
@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
|
||||||
// determine default settings depending on the driver
|
// determine default settings depending on the driver
|
||||||
QString defaultHostName;
|
QString defaultHostName;
|
||||||
QString defaultOptions;
|
QString defaultOptions;
|
||||||
@ -100,7 +132,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
|
|||||||
QString defaultInitDbPath;
|
QString defaultInitDbPath;
|
||||||
QString defaultPgData;
|
QString defaultPgData;
|
||||||
|
|
||||||
@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings
|
@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
|
||||||
|
|
||||||
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
|
mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
|
||||||
if (mInternalServer) {
|
if (mInternalServer) {
|
||||||
@ -130,14 +162,13 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
|
|||||||
- }
|
- }
|
||||||
- }
|
- }
|
||||||
- postgresSearchPath.append(postgresVersionedSearchPaths);
|
- postgresSearchPath.append(postgresVersionedSearchPaths);
|
||||||
-
|
- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath);
|
||||||
- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
|
- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath);
|
||||||
- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
|
|
||||||
+ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
|
+ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
|
||||||
defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
|
defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
|
||||||
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
|
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
|
||||||
}
|
}
|
||||||
@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings
|
@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
|
||||||
mUserName = settings.value(QStringLiteral("User")).toString();
|
mUserName = settings.value(QStringLiteral("User")).toString();
|
||||||
mPassword = settings.value(QStringLiteral("Password")).toString();
|
mPassword = settings.value(QStringLiteral("Password")).toString();
|
||||||
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
|
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
|
||||||
@ -149,7 +180,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
|
|||||||
qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
|
qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
|
||||||
mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
|
mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
|
||||||
if (mInternalServer && mInitDbPath.isEmpty()) {
|
if (mInternalServer && mInitDbPath.isEmpty()) {
|
||||||
@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings
|
@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
|
||||||
settings.setValue(QStringLiteral("Port"), mHostPort);
|
settings.setValue(QStringLiteral("Port"), mHostPort);
|
||||||
}
|
}
|
||||||
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
|
settings.setValue(QStringLiteral("Options"), mConnectionOptions);
|
||||||
@ -157,35 +188,3 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
|
|||||||
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
|
settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
|
||||||
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
|
settings.setValue(QStringLiteral("StartServer"), mInternalServer);
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
|
|
||||||
===================================================================
|
|
||||||
--- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp
|
|
||||||
+++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
|
|
||||||
@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
|
|
||||||
} else {
|
|
||||||
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
|
|
||||||
const QStringList arguments = QStringList() << executable << identifier();
|
|
||||||
- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
|
|
||||||
+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
|
|
||||||
mController->start(agentLauncherExec, arguments);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
|
|
||||||
===================================================================
|
|
||||||
--- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp
|
|
||||||
+++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
|
|
||||||
@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose,
|
|
||||||
mStorageController = new Akonadi::ProcessControl;
|
|
||||||
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
|
|
||||||
connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
|
|
||||||
- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
|
||||||
+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
|
||||||
|
|
||||||
if (mAgentServerEnabled) {
|
|
||||||
mAgentServer = new Akonadi::ProcessControl;
|
|
||||||
connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
|
|
||||||
- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
|
||||||
+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef QT_NO_DEBUG
|
|
||||||
|
@ -1 +1 @@
|
|||||||
WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' )
|
WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' )
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
mkDerivation, lib, kdepimTeam,
|
mkDerivation, lib, kdepimTeam,
|
||||||
extra-cmake-modules, kdoctools,
|
extra-cmake-modules, kdoctools,
|
||||||
akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
|
akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
|
||||||
kpimtextedit,
|
kpimtextedit, kcalutils
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
@ -13,7 +13,7 @@ mkDerivation {
|
|||||||
};
|
};
|
||||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit
|
akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
|
||||||
];
|
];
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
|
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
|
||||||
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
|
ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
|
||||||
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
|
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
|
||||||
kwindowsystem, kxmlgui, qtscript
|
kwindowsystem, kxmlgui, qtscript, knewstuff
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
@ -17,7 +17,7 @@ mkDerivation {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
|
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
|
||||||
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
|
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
|
||||||
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
|
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
|
||||||
];
|
];
|
||||||
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
|
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
|
kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
|
||||||
kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet,
|
kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet,
|
||||||
kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5,
|
kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5,
|
||||||
qtdeclarative, qtsvg, threadweaver
|
qtdeclarative, qtsvg, threadweaver, kcrash
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
@ -16,7 +16,7 @@ mkDerivation {
|
|||||||
kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
|
kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
|
||||||
kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet
|
kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet
|
||||||
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
|
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
|
||||||
qtdeclarative qtsvg threadweaver
|
qtdeclarative qtsvg threadweaver kcrash
|
||||||
] ++ lib.optional (!stdenv.isAarch64) chmlib;
|
] ++ lib.optional (!stdenv.isAarch64) chmlib;
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = http://www.kde.org;
|
homepage = http://www.kde.org;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
ki18n, xcb-util-cursor,
|
ki18n, xcb-util-cursor,
|
||||||
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
|
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
|
||||||
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
|
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
|
||||||
qtx11extras
|
qtx11extras, knewstuff
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
@ -14,6 +14,7 @@ mkDerivation {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
|
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
|
||||||
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
|
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
|
||||||
|
knewstuff
|
||||||
];
|
];
|
||||||
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
|
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user