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

* Turn parallel building support on again (got lost somewhere...).

Browse Source 
svn path=/nixpkgs/trunk/; revision=29035
This commit is contained in:
Eelco Dolstra 2011-09-05 19:23:06 +00:00
parent 9d1bee3245
commit 378009ff4a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,10 +27,11 @@ rec {
# released as individual tarballs # released as individual tarballs
kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}: kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${name}-${release}"; name = "${name}-${release}";
src = kdesrc name; src = kdesrc name;
meta = defMeta // meta; meta = defMeta // meta;
} // (removeAttrs a [ "meta" "name" ])); enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" ]));
# kdeMonoPkg wrapper for modules splitted upstream. Used in TODO # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO
kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
@ -43,9 +44,13 @@ rec {
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${name}-${release}"; name = "${name}-${release}";
src = kdesrc module; src = kdesrc module;
cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" cmakeFlags =
"-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags; [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
"-DBUILD_doc=TRUE"
"-DBUILD_${subdir}=TRUE"
] ++ cmakeFlags;
meta = defMeta // meta; meta = defMeta // meta;
enableParallelBuilding = true;
} // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
# A KDE monolithic module # A KDE monolithic module