Author: urkud
Date: Sat Jan 7 00:02:28 2012
New Revision: 31388
URL: https://nixos.org/websvn/nix/?rev=31388&sc=1
Log:
Fix kde48.kdelibs evaluation error
Will write kactivities.nix when hydra will build kde48.kdelibs
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix Sat Jan 7
00:02:23 2012 (r31387)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix Sat Jan 7
00:02:28 2012 (r31388)
@@ -117,13 +117,6 @@
];
}
{
- module="kdelibs";
- split=true;
- pkgs=[
- { name="kactivities"; }
- ];
-}
-{
module="kdeutils";
split=true;
pkgs=[
@@ -208,6 +201,7 @@
{ name="konsole"; }
];
}
+{ module="kactivities"; split=false;}
{ module="kdeadmin"; split=false;
pkgs=[
{ name="strigi-analyzer"; sane="strigi_analyzer";}
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh Sat Jan
7 00:02:23 2012 (r31387)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh Sat Jan
7 00:02:28 2012 (r31388)
@@ -34,6 +34,7 @@
eval `xsltproc kde-submodules.xslt kde_projects.xml`
module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
print_sane() {
echo "Called print_sane $1" >&2
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
