makeKDEWrapper: separate from extra-cmake-modules

This commit is contained in:
Thomas Tuegel 2015-10-14 18:41:23 -05:00
parent d57e50d840
commit 3af1894557
33 changed files with 72 additions and 49 deletions

View file

@ -1,12 +1,14 @@
{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
, shared_mime_info
, kwidgetsaddons, kwindowsystem, makeKDEWrapper, plasma-framework
, qtdeclarative, shared_mime_info
}:
plasmaPackage {
name = "bluedevil";
nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
nativeBuildInputs = [
extra-cmake-modules makeKDEWrapper shared_mime_info
];
buildInputs = [
kcoreaddons kdbusaddons kded kiconthemes knotifications
kwidgetsaddons

View file

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, frameworkintegration
, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
, ki18n, kwindowsystem, qtx11extras
, ki18n, kwindowsystem, makeKDEWrapper, qtx11extras
}:
plasmaPackage {
@ -8,6 +8,7 @@ plasmaPackage {
sname = "breeze";
nativeBuildInputs = [
extra-cmake-modules
makeKDEWrapper
];
buildInputs = [
kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons

View file

@ -1,11 +1,11 @@
{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
, kwindowsystem, qtsvg, qtx11extras
, kwindowsystem, makeKDEWrapper, qtsvg, qtx11extras
}:
plasmaPackage {
name = "kde-cli-tools";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [
kcmutils kconfig kdesu kiconthemes
];

View file

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
, khtml, kservice
, khtml, kservice, makeKDEWrapper
}:
plasmaPackage {
@ -8,6 +8,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
kconfig kcoreaddons kdbusaddons kinit kcmutils kservice

View file

@ -1,7 +1,8 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
, kservice, kwidgetsaddons, kxmlgui, libraw1394, pciutils, solid
, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeKDEWrapper
, pciutils, solid
}:
plasmaPackage {
@ -9,6 +10,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons

View file

@ -1,5 +1,5 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support
, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeKDEWrapper
}:
plasmaPackage {
@ -7,6 +7,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
kxmlgui kdbusaddons kiconthemes

View file

@ -1,12 +1,13 @@
{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
, libkscreen, qtdeclarative
, libkscreen, makeKDEWrapper, qtdeclarative
}:
plasmaPackage {
name = "kscreen";
nativeBuildInputs = [
extra-cmake-modules
makeKDEWrapper
];
buildInputs = [
kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui

View file

@ -1,10 +1,10 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
, ki18n, kwallet, kwidgetsaddons
, ki18n, kwallet, kwidgetsaddons, makeKDEWrapper
}:
plasmaPackage {
name = "ksshaskpass";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
propagatedBuildInputs = [ ki18n ];
postInstall = ''

View file

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
, kiconthemes, libksysguard
, kiconthemes, libksysguard, makeKDEWrapper
}:
plasmaPackage {
@ -8,6 +8,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard

View file

@ -1,12 +1,12 @@
{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig
, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
, frameworkintegration, kwindowsystem, qtx11extras
, frameworkintegration, kwindowsystem, makeKDEWrapper, qtx11extras
}:
plasmaPackage {
name = "oxygen";
nativeBuildInputs = [
extra-cmake-modules
extra-cmake-modules makeKDEWrapper
];
buildInputs = [
kcmutils kconfig kdecoration kguiaddons kwidgetsaddons

View file

@ -6,7 +6,7 @@
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
, libcanberra_kde, libpulseaudio, utillinux
, libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux
}:
plasmaPackage {
@ -14,6 +14,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels

View file

@ -2,9 +2,9 @@
, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kxmlgui, mobile_broadband_provider_info, modemmanager-qt
, networkmanager-qt, openconnect, plasma-framework, qtdeclarative
, solid
, kxmlgui, makeKDEWrapper, mobile_broadband_provider_info
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
, qtdeclarative, solid
}:
plasmaPackage {
@ -12,6 +12,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes

View file

@ -6,8 +6,8 @@
, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
, libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig
, kinit, kservice, qttools, dbus_tools, mkfontdir, xmessage, xprop
, xrdb, xset, xsetroot, solid
, kinit, kservice, makeKDEWrapper, qttools, dbus_tools, mkfontdir, xmessage
, xprop, xrdb, xset, xsetroot, solid
}:
plasmaPackage {
@ -15,6 +15,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff

View file

@ -1,6 +1,6 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews
, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem
, kxmlgui, kdbusaddons, kconfig, khtml
, kxmlgui, kdbusaddons, kconfig, khtml, makeKDEWrapper
}:
plasmaPackage {
@ -8,6 +8,7 @@ plasmaPackage {
nativeBuildInputs = [
extra-cmake-modules
kdoctools
makeKDEWrapper
];
buildInputs = [
kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons

View file

@ -1,11 +1,11 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
, kio, lmdb, qtbase, qtquick1, solid
, kio, lmdb, makeKDEWrapper, qtbase, qtquick1, solid
}:
kdeFramework {
name = "baloo";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
buildInputs = [
kconfig kcrash kdbusaddons lmdb qtquick1 solid
];

View file

@ -9,7 +9,7 @@
let
inherit (pkgs) lib stdenv;
inherit (pkgs) lib makeSetupHook stdenv;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
@ -105,6 +105,7 @@ let
solid = callPackage ./solid.nix {};
sonnet = callPackage ./sonnet.nix {};
threadweaver = callPackage ./threadweaver.nix {};
makeKDEWrapper = callPackage ./make-kde-wrapper.nix { inherit makeSetupHook; };
};
newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);

View file

@ -2,7 +2,6 @@
kdeFramework {
name = "extra-cmake-modules";
setupHook = ./setup-hook.sh;
patches = [ ./0001-extra-cmake-modules-paths.patch ];
# It is OK to propagate these inputs as long as

View file

@ -1,11 +1,11 @@
{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
, kio, kservice, kwindowsystem, kxmlgui, makeKDEWrapper, qtdeclarative
}:
kdeFramework {
name = "kactivities";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
buildInputs = [
boost kcmutils kconfig kcoreaddons kdbusaddons kservice
kxmlgui

View file

@ -1,10 +1,11 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeKDEWrapper
}:
kdeFramework {
name = "kconfig";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
postInstall = ''
wrapKDEProgram "$out/bin/kreadconfig5"
wrapKDEProgram "$out/bin/kwriteconfig5"

View file

@ -1,10 +1,10 @@
{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
, kdoctools, kguiaddons, ki18n, kwidgetsaddons
, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeKDEWrapper
}:
kdeFramework {
name = "kconfigwidgets";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [ kguiaddons ];
propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];

View file

@ -1,11 +1,12 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeKDEWrapper
, qtx11extras
}:
kdeFramework {
name = "kdbusaddons";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
propagatedBuildInputs = [ qtx11extras ];
postInstall = ''
wrapKDEProgram "$out/bin/kquitapp5"

View file

@ -1,11 +1,12 @@
{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
, kwidgetsaddons, kwindowsystem, makeKDEWrapper, pkgconfig
, qtdeclarative
}:
kdeFramework {
name = "kdeclarative";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
buildInputs = [
epoxy kguiaddons kiconthemes kwidgetsaddons
];

View file

@ -1,5 +1,5 @@
{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
, docbook5_xsl, karchive, ki18n, perl, perlPackages
, docbook5_xsl, karchive, ki18n, makeKDEWrapper, perl, perlPackages
}:
kdeFramework {
@ -7,7 +7,7 @@ kdeFramework {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive ];
propagatedBuildInputs = [ ki18n ];
propagatedNativeBuildInputs = [ perl perlPackages.URI ];
propagatedNativeBuildInputs = [ makeKDEWrapper perl perlPackages.URI ];
cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"

View file

@ -5,12 +5,13 @@
, kcrash
, kdbusaddons
, kwindowsystem
, makeKDEWrapper
, qtx11extras
}:
kdeFramework {
name = "kglobalaccel";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
propagatedBuildInputs = [ kwindowsystem qtx11extras ];
postInstall = ''

View file

@ -2,13 +2,13 @@
, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
, kwidgetsaddons, kwindowsystem, kxmlgui, qtscript, qtx11extras
, solid
, kwidgetsaddons, kwindowsystem, kxmlgui, makeKDEWrapper
, qtscript, qtx11extras, solid
}:
kdeFramework {
name = "kio";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [
acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
knotifications ktextwidgets kwallet kwidgetsaddons

View file

@ -1,11 +1,12 @@
{ kdeFramework, lib
, extra-cmake-modules
, kdoctools
, makeKDEWrapper
}:
kdeFramework {
name = "kjs";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
postInstall = ''
wrapKDEProgram "$out/bin/kjs5"
'';

View file

@ -1,10 +1,10 @@
{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
, qtsvg
, makeKDEWrapper, qtsvg
}:
kdeFramework {
name = "kjsembed";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [ qtsvg ];
propagatedBuildInputs = [ ki18n kjs ];
postInstall = ''

View file

@ -5,11 +5,12 @@
, kcoreaddons
, kdoctools
, ki18n
, makeKDEWrapper
}:
kdeFramework {
name = "kpackage";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [ karchive kconfig ];
propagatedBuildInputs = [ kcoreaddons ki18n ];
patches = [

View file

@ -1,11 +1,11 @@
{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
, kservice, kwidgetsaddons, kwindowsystem, libgcrypt
, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeKDEWrapper
}:
kdeFramework {
name = "kwallet";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [
kconfig kcoreaddons kdbusaddons kiconthemes knotifications
kservice kwidgetsaddons libgcrypt

View file

@ -0,0 +1,3 @@
{ makeSetupHook, makeQtWrapper }:
makeSetupHook { deps = [ makeQtWrapper ]; } ./make-kde-wrapper.sh

View file

@ -2,12 +2,12 @@
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
, qtscript, qtx11extras
, makeKDEWrapper, qtscript, qtx11extras
}:
kdeFramework {
name = "plasma-framework";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
buildInputs = [
karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
kiconthemes knotifications kxmlgui qtscript

View file

@ -1,10 +1,11 @@
{ kdeFramework, lib
, extra-cmake-modules
, makeKDEWrapper
}:
kdeFramework {
name = "solid";
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
postInstall = ''
wrapKDEProgram "$out/bin/solid-hardware5"
'';