diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-07 00:02:28 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-07 00:02:28 +0000 |
| commit | 50de8e181fd7b9a57e595c1f4605eff4e0fb1618 (patch) | |
| tree | 0db2f49c068d19bb1246287ad523de26d38a4c5d /pkgs/desktops | |
| parent | d4509553e6d28ce28289f06646041e94ef954fea (diff) | |
| download | nixlib-50de8e181fd7b9a57e595c1f4605eff4e0fb1618.tar nixlib-50de8e181fd7b9a57e595c1f4605eff4e0fb1618.tar.gz nixlib-50de8e181fd7b9a57e595c1f4605eff4e0fb1618.tar.bz2 nixlib-50de8e181fd7b9a57e595c1f4605eff4e0fb1618.tar.lz nixlib-50de8e181fd7b9a57e595c1f4605eff4e0fb1618.tar.xz nixlib-50de8e181fd7b9a57e595c1f4605eff4e0fb1618.tar.zst nixlib-50de8e181fd7b9a57e595c1f4605eff4e0fb1618.zip | |
Fix kde48.kdelibs evaluation error
Will write kactivities.nix when hydra will build kde48.kdelibs svn path=/nixpkgs/trunk/; revision=31388
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.8/kde-package/4.7.97.nix | 8 | ||||
| -rwxr-xr-x | pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix index f793597544ee..8a8057082767 100644 --- a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix +++ b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix @@ -117,13 +117,6 @@ modules=[ ]; } { - module="kdelibs"; - split=true; - pkgs=[ - { name="kactivities"; } - ]; -} -{ module="kdeutils"; split=true; pkgs=[ @@ -208,6 +201,7 @@ sane="kde_baseapps"; split=true; { name="konsole"; } ]; } +{ module="kactivities"; split=false;} { module="kdeadmin"; split=false; pkgs=[ { name="strigi-analyzer"; sane="strigi_analyzer";} diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh index 910394fb6a33..ef8189cb7c53 100755 --- a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh +++ b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh @@ -34,6 +34,7 @@ fi eval `xsltproc kde-submodules.xslt kde_projects.xml` module[kde-baseapps]=kde-baseapps +unset module[kactivities] print_sane() { echo "Called print_sane $1" >&2 |