nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

kdeApps_15_04: fix kaccounts-integration

Browse Source
This commit is contained in:
Thomas Tuegel 2015-05-06 10:53:26 -05:00
parent 68350c5b9f
commit 84ff78dd8b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }:
{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, callPackage, debug ? false }:
with stdenv.lib; with autonix;
@ -191,6 +191,14 @@ let
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 // {
buildInputs = super.kaccounts-providers.buildInputs
++ (with pkgs; [ intltool libaccounts-glib ]);
@ -329,6 +337,13 @@ let
buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
};
marble = super.marble // {
preConfigure = ''
${super.preConfigure or ""}
cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
'';
};
};
l10nManifest =