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

Add meta to kde-4.7 'subdir' pkgs

Browse Source 
svn path=/nixpkgs/trunk/; revision=28816
This commit is contained in:
Yury G. Kudryashov 2011-08-25 20:00:55 +00:00
parent 69a8ca2dc8
commit 5c90976c6a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/kde-4.7/kde-package/default.nix
View File

@ -39,13 +39,14 @@ rec {
kdeSubdirPkg = module: kdeSubdirPkg = module:
{name, subdir ? name, sane ? name}: {name, subdir ? name, sane ? name}:
let name_ = name; in let name_ = name; in
a@{cmakeFlags ? [], name ? name_, ...}: a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${name}-${release}"; name = "${name}-${release}";
src = kdesrc module; src = kdesrc module;
cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
"-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags; "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
} // (removeAttrs a [ "cmakeFlags" ])); meta = defMeta // meta;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module # A KDE monolithic module
kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };