public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Hack to fix evaluation.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=27869
This commit is contained in:
Eelco Dolstra 2011-07-21 11:56:11 +00:00
parent b32ea60b4e
commit ef041b7aa3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/kde-4.7/default.nix
View File

@ -48,7 +48,7 @@ recurseIntoAttrs rec {
kdelibs = callPackage ./libs { }; kdelibs = callPackage ./libs { };
kdepimlibs = callPackage ./pimlibs { }; #kdepimlibs = callPackage ./pimlibs { };
### BASE ### BASE
@ -79,6 +79,7 @@ recurseIntoAttrs rec {
kde_wallpapers = callPackage ./wallpapers.nix { }; kde_wallpapers = callPackage ./wallpapers.nix { };
/*
kdeaccessibility = combinePkgs "kdeaccessibility" { kdeaccessibility = combinePkgs "kdeaccessibility" {
colorSchemes = callPackage ./accessibility/color-schemes.nix { }; colorSchemes = callPackage ./accessibility/color-schemes.nix { };
iconThemes = callPackage ./accessibility/icon-themes.nix { }; iconThemes = callPackage ./accessibility/icon-themes.nix { };
@ -165,9 +166,11 @@ recurseIntoAttrs rec {
kdepim_runtime = callPackage ./pim-runtime { }; kdepim_runtime = callPackage ./pim-runtime { };
kdepim = callPackage ./pim { }; kdepim = callPackage ./pim { };
*/
### DEVELOPMENT ### DEVELOPMENT
/*
kdebindings = callPackage ./bindings { }; kdebindings = callPackage ./bindings { };
l10n = callPackage ./l10n { inherit release; }; l10n = callPackage ./l10n { inherit release; };
@ -175,5 +178,6 @@ recurseIntoAttrs rec {
# Make the split packages visible to `nix-env -q'. # Make the split packages visible to `nix-env -q'.
misc = recurseIntoAttrs misc = recurseIntoAttrs
(kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs); (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs);
*/
} }

2
pkgs/top-level/all-packages.nix
View File

@ -3001,6 +3001,8 @@ let
clucene_core = callPackage ../development/libraries/clucene-core { }; clucene_core = callPackage ../development/libraries/clucene-core { };
cluceneCore = clucene_core; # !!! remove this
clutter = callPackage ../development/libraries/clutter { clutter = callPackage ../development/libraries/clutter {
inherit (gnome) glib pango gtk; inherit (gnome) glib pango gtk;
}; };