kde5: rename extra-cmake-modules variants

Instead of one package `extra-cmake-modules`, there is now `ecm` and
`ecmNoHooks`. The latter is used when one does not want to incur a Qt 5
dependency; it is also available as a top-level package
`extra-cmake-modules`.
This commit is contained in:
Thomas Tuegel 2016-07-30 13:47:17 -05:00
parent a5302f3c79
commit d5bec1a145
7 changed files with 12 additions and 49 deletions

View file

@ -214,7 +214,7 @@ in
services.xserver.displayManager.sddm = { services.xserver.displayManager.sddm = {
theme = "breeze"; theme = "breeze";
themes = [ themes = [
kde5.extra-cmake-modules # for the setup-hook kde5.ecm # for the setup-hook
kde5.plasma-workspace kde5.plasma-workspace
kde5.breeze-icons kde5.breeze-icons
(kde5.oxygen-icons or kde5.oxygen-icons5) (kde5.oxygen-icons or kde5.oxygen-icons5)

View file

@ -55,12 +55,12 @@ let
bluez-qt = callPackage ./bluez-qt.nix {}; bluez-qt = callPackage ./bluez-qt.nix {};
breeze-icons = callPackage ./breeze-icons.nix {}; breeze-icons = callPackage ./breeze-icons.nix {};
ecm = ecm =
let drv = { cmake, extra-cmake-modules, pkgconfig, qtbase, qttools }: let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
makeSetupHook makeSetupHook
{ deps = [ cmake extra-cmake-modules pkgconfig qtbase qttools ]; } { deps = [ cmake ecmNoHooks pkgconfig qtbase qttools ]; }
./setup-hook.sh; ./setup-hook.sh;
in callPackage drv {}; in callPackage drv {};
extra-cmake-modules = callPackage ./extra-cmake-modules { ecmNoHooks = callPackage ./extra-cmake-modules {
inherit (srcs.extra-cmake-modules) src version; inherit (srcs.extra-cmake-modules) src version;
}; };
frameworkintegration = callPackage ./frameworkintegration.nix {}; frameworkintegration = callPackage ./frameworkintegration.nix {};
@ -113,7 +113,7 @@ let
kross = callPackage ./kross.nix {}; kross = callPackage ./kross.nix {};
krunner = callPackage ./krunner.nix {}; krunner = callPackage ./krunner.nix {};
kservice = callPackage ./kservice {}; kservice = callPackage ./kservice {};
ktexteditor = callPackage ./ktexteditor {}; ktexteditor = callPackage ./ktexteditor.nix {};
ktextwidgets = callPackage ./ktextwidgets.nix {}; ktextwidgets = callPackage ./ktextwidgets.nix {};
kunitconversion = callPackage ./kunitconversion.nix {}; kunitconversion = callPackage ./kunitconversion.nix {};
kwallet = callPackage ./kwallet.nix {}; kwallet = callPackage ./kwallet.nix {};

View file

@ -1,11 +1,12 @@
{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcoreaddons {
, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem kdeFramework, lib, copyPathsToStore, ecm,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
}: }:
kdeFramework { kdeFramework {
name = "kservice"; name = "kservice";
meta = { maintainers = [ lib.maintainers.ttuegel ]; }; meta = { maintainers = [ lib.maintainers.ttuegel ]; };
propagatedNativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ ecm ];
nativeBuildInputs = [ kdoctools ]; nativeBuildInputs = [ kdoctools ];
propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

View file

@ -1,5 +1,5 @@
{ kdeFramework, lib, copyPathsToStore { kdeFramework, lib, copyPathsToStore
, extra-cmake-modules, perl , ecm, perl
, karchive, kconfig, kguiaddons, kiconthemes, kparts , karchive, kconfig, kguiaddons, kiconthemes, kparts
, libgit2 , libgit2
, qtscript, qtxmlpatterns , qtscript, qtxmlpatterns
@ -9,10 +9,9 @@
kdeFramework { kdeFramework {
name = "ktexteditor"; name = "ktexteditor";
meta = { maintainers = [ lib.maintainers.ttuegel ]; }; meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules perl ]; nativeBuildInputs = [ ecm perl ];
propagatedBuildInputs = [ propagatedBuildInputs = [
karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
qtxmlpatterns sonnet qtxmlpatterns sonnet
]; ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
} }

View file

@ -1,36 +0,0 @@
Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
===================================================================
--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
int main(int argc, char *argv[])
{
- // get app instance
- QCoreApplication app(argc, argv);
-
// ensure enough arguments are passed
- if (app.arguments().size() < 3)
+ if (argc < 3)
return 1;
// open schema
QXmlSchema schema;
- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
return 2;
- const QString hlFilenamesListing = app.arguments().value(3);
+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
if (hlFilenamesListing.isEmpty()) {
return 1;
}
@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
return anyError;
// create outfile, after all has worked!
- QFile outFile(app.arguments().at(1));
+ QFile outFile(QString::fromLocal8Bit(argv[1]));
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
return 7;

View file

@ -1 +0,0 @@
no-qcoreapplication.patch

View file

@ -6267,7 +6267,7 @@ in
cmakeWithGui = self.cmakeCurses.override { useQt4 = true; }; cmakeWithGui = self.cmakeCurses.override { useQt4 = true; };
# Does not actually depend on Qt 5 # Does not actually depend on Qt 5
extra-cmake-modules = qt5.extra-cmake-modules; extra-cmake-modules = qt5.ecmNoHooks;
coccinelle = callPackage ../development/tools/misc/coccinelle { }; coccinelle = callPackage ../development/tools/misc/coccinelle { };