public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makeKDEWrapper: separate from extra-cmake-modules

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/kde-frameworks-5.15/baloo.nix
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
];

3
pkgs/development/libraries/kde-frameworks-5.15/default.nix
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);

1
pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix
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

4
pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix
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

3
pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix
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"

4
pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix
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 ];

3
pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix
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"

5
pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix
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
];

4
pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix
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"

3
pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix
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 = ''

6
pkgs/development/libraries/kde-frameworks-5.15/kio.nix
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

3
pkgs/development/libraries/kde-frameworks-5.15/kjs.nix
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"
'';

4
pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix
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 = ''

3
pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix
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 = [

4
pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix
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

3
pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix Normal file
View File

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

0
pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh → pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh
View File

4
pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix
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

3
pkgs/development/libraries/kde-frameworks-5.15/solid.nix
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"
'';