diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-09-05 19:23:06 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-09-05 19:23:06 +0000 |
| commit | 378009ff4a9b014c5a8f9381549575161acb55cd (patch) | |
| tree | ae7d4cfe68068ac0a1baef5da78f92194dd38944 | |
| parent | haskell-xmonad-extras: updated build expression (diff) | |
| download | nixpkgs-378009ff4a9b014c5a8f9381549575161acb55cd.tar.gz | |
* Turn parallel building support on again (got lost somewhere...).
svn path=/nixpkgs/trunk/; revision=29035
| -rw-r--r-- | pkgs/desktops/kde-4.7/kde-package/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix index d06f8a8fd8b4..f725c2f7bb10 100644 --- a/pkgs/desktops/kde-4.7/kde-package/default.nix +++ b/pkgs/desktops/kde-4.7/kde-package/default.nix @@ -27,10 +27,11 @@ rec { # released as individual tarballs kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}: stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc name; - meta = defMeta // meta; - } // (removeAttrs a [ "meta" "name" ])); + name = "${name}-${release}"; + src = kdesrc name; + meta = defMeta // meta; + enableParallelBuilding = true; + } // (removeAttrs a [ "meta" "name" ])); # kdeMonoPkg wrapper for modules splitted upstream. Used in TODO kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; @@ -43,9 +44,13 @@ rec { stdenv.mkDerivation ({ name = "${name}-${release}"; src = kdesrc module; - cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags; + cmakeFlags = + [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" + "-DBUILD_doc=TRUE" + "-DBUILD_${subdir}=TRUE" + ] ++ cmakeFlags; meta = defMeta // meta; + enableParallelBuilding = true; } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); # A KDE monolithic module |