Skip to content

Commit

Permalink
kde5.frameworks: 5.24 -> 5.26
Browse files Browse the repository at this point in the history
(cherry picked from commit ebe90e3)
  • Loading branch information
ttuegel committed Nov 5, 2016
1 parent 899eb79 commit b5f4e8e
Show file tree
Hide file tree
Showing 5 changed files with 303 additions and 305 deletions.
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/fetch.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.26/ -A '*.tar.xz' )
14 changes: 5 additions & 9 deletions pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
{ kdeFramework, lib
, ecm
, kconfig
, kcoreaddons
, kcrash
, kdbusaddons
, kwindowsystem
, qtx11extras
{
kdeFramework, lib, ecm,
kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
qtx11extras
}:

kdeFramework {
name = "kglobalaccel";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [
kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras
kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
];
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
kdeFramework, lib, copyPathsToStore, ecm,
kdeFramework, lib, copyPathsToStore,
bison, ecm, flex,
kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
}:

kdeFramework {
name = "kservice";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
propagatedNativeBuildInputs = [ ecm ];
propagatedNativeBuildInputs = [ bison ecm flex ];
nativeBuildInputs = [ kdoctools ];
propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
Expand Down
9 changes: 5 additions & 4 deletions pkgs/development/libraries/kde-frameworks/solid.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{ kdeFramework, lib
, ecm
, qtdeclarative
{
kdeFramework, lib,
bison, ecm, flex,
qtdeclarative
}:

kdeFramework {
name = "solid";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ ecm ];
nativeBuildInputs = [ bison ecm flex ];
propagatedBuildInputs = [ qtdeclarative ];
}

0 comments on commit b5f4e8e

Please sign in to comment.