diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-24 09:44:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-24 09:44:10 +0100 |
| commit | fb81c8e4558ca64ca2a8368069d7f695d88f9009 (patch) | |
| tree | 3ee105485ebd559c8ca3c2eeb9704d5b04572928 /pkgs | |
| parent | fa42471a2f0732ddf923522a75727a530f64deaf (diff) | |
| download | nixlib-fb81c8e4558ca64ca2a8368069d7f695d88f9009.tar nixlib-fb81c8e4558ca64ca2a8368069d7f695d88f9009.tar.gz nixlib-fb81c8e4558ca64ca2a8368069d7f695d88f9009.tar.bz2 nixlib-fb81c8e4558ca64ca2a8368069d7f695d88f9009.tar.lz nixlib-fb81c8e4558ca64ca2a8368069d7f695d88f9009.tar.xz nixlib-fb81c8e4558ca64ca2a8368069d7f695d88f9009.tar.zst nixlib-fb81c8e4558ca64ca2a8368069d7f695d88f9009.zip | |
kde48.kdebase_workspace: disable parallel build
There were frequent problems with this on Hydra.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.8/kde-package/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.8/kde-workspace.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-4.8/kde-package/default.nix b/pkgs/desktops/kde-4.8/kde-package/default.nix index da6440b58faf..cd2860920d67 100644 --- a/pkgs/desktops/kde-4.8/kde-package/default.nix +++ b/pkgs/desktops/kde-4.8/kde-package/default.nix @@ -51,7 +51,7 @@ rec { "-DBUILD_${subdir}=TRUE" ] ++ cmakeFlags; meta = defMeta // meta; - enableParallelBuilding = true; + enableParallelBuilding = module.enableParallelBuilding or true; } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); # A KDE monolithic module diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix index 97192e55be37..394cd550b968 100644 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -28,6 +28,8 @@ kde { --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 ''; + enableParallelBuilding = false; # frequent problems on Hydra + meta = { description = "KDE workspace components such as Plasma, Kwin and System Settings"; license = "GPLv2"; |