Author: eelco
Date: Mon Sep 5 19:23:06 2011
New Revision: 29035
URL: https://svn.nixos.org/websvn/nix/?rev=29035&sc=1
Log:
* Turn parallel building support on again (got lost somewhere...).
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Mon Sep 5
18:25:59 2011 (r29034)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.7/kde-package/default.nix Mon Sep 5
19:23:06 2011 (r29035)
@@ -27,10 +27,11 @@
# 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 @@
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
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
