ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Add missing KDE Telepathy dependencies

Browse Source
This commit is contained in:
Thomas Tuegel 2015-05-13 09:24:41 -05:00
parent 15ffb9ad88
commit 020e06e410
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -64,6 +64,7 @@ let
(with pkgs; (with pkgs;
{ {
ACL = acl; ACL = acl;
AccountsQt5 = accounts-qt.override { inherit qt5; };
Akonadi = kde4.akonadi; Akonadi = kde4.akonadi;
Alsa = alsaLib; Alsa = alsaLib;
Automoc4 = automoc4; Automoc4 = automoc4;
@ -95,6 +96,7 @@ let
GSL = gsl; GSL = gsl;
HUNSPELL = hunspell; HUNSPELL = hunspell;
HUpnp = herqq; HUpnp = herqq;
Intltool = intltool;
Jasper = jasper; Jasper = jasper;
KActivities = kde4.kactivities; KActivities = kde4.kactivities;
LCMS2 = lcms2; LCMS2 = lcms2;
@ -122,6 +124,7 @@ let
Samba = samba; Samba = samba;
Sasl2 = cyrus_sasl; Sasl2 = cyrus_sasl;
SharedDesktopOntologies = shared_desktop_ontologies; SharedDesktopOntologies = shared_desktop_ontologies;
SignOnQt5 = signon.override { inherit qt5; };
SndFile = libsndfile; SndFile = libsndfile;
Speechd = speechd; Speechd = speechd;
TIFF = libtiff; TIFF = libtiff;
@ -193,17 +196,9 @@ let
nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig]; nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
}; };
kaccounts-integration =
let accounts-qt = pkgs.accounts-qt.override { inherit qt5; };
signon = pkgs.signon.override { inherit qt5; };
in super.kaccounts-integration // {
buildInputs = super.kaccounts-integration.buildInputs
++ [ accounts-qt signon ];
};
kaccounts-providers = super.kaccounts-providers // { kaccounts-providers = super.kaccounts-providers // {
buildInputs = super.kaccounts-providers.buildInputs buildInputs = super.kaccounts-providers.buildInputs
++ (with pkgs; [ intltool libaccounts-glib ]); ++ (with pkgs; [ libaccounts-glib ]);
preConfigure = '' preConfigure = ''
${super.kaccounts-providers.preConfigure or ""} ${super.kaccounts-providers.preConfigure or ""}
substituteInPlace webkit-options/CMakeLists.txt \ substituteInPlace webkit-options/CMakeLists.txt \
@ -324,6 +319,18 @@ let
++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
}; };
ktp-accounts-kcm = super.ktp-accounts-kcm // {
buildInputs =
super.ktp-accounts-kcm.buildInputs
++ [ pkgs.libaccounts-glib ];
};
ktp-common-internals = super.ktp-common-internals // {
buildInputs =
super.ktp-common-internals.buildInputs
++ (with kf5; [ kdelibs4support kparts ]);
};
libkdcraw = with pkgs; super.libkdcraw // { libkdcraw = with pkgs; super.libkdcraw // {
buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw]; buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig]; nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];