From cba6d9b11a018b17c8e2bce8ad1741821022f37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Jun 2013 10:06:23 +0200 Subject: [PATCH] qt48: I give up, switching off parallel building I was unable to find a reliable fix for the problems. I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload . # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch x-updates # You are currently rebasing branch 'x-updates' on '81b7f5f'. # (all conflicts fixed: run "git rebase --continue") # # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: pkgs/development/libraries/qt-4.x/4.8/default.nix # # Untracked files: # (use "git add ..." to include in what will be committed) # # core # dev.diff # pkgs/applications/networking/browsers/firefox/cairo-test.patch # pkgs/applications/video/flowblade/ # pkgs/desktops/gnome-3/core/dconf/ # pkgs/desktops/gnome-3/core/eog/ # pkgs/desktops/gnome-3/core/libsecret/ # pkgs/development/libraries/ncurses/builder.sh # pkgs/servers/x11/xorg/download-cache/ # pkgs/servers/x11/xorg/still-missing.txt --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a00f9e5c81ab..d0e23e596885 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -90,12 +90,6 @@ stdenv.mkDerivation rec { ${if developerBuild then "-developer-build" else ""} ''; - # fix underspecified dependency in a generated makefile - postConfigure = stdenv.lib.optional developerBuild '' - sed "1iqtgradientview.h: .uic/release-shared/ui_qtgradientview.h" \ - -i tools/designer/src/lib/Makefile - ''; - propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM @@ -113,7 +107,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig which ]; - enableParallelBuilding = true; + # occasional build problems if one has too many cores (like on Hydra) + # @vcunat has been unable to find a *reliable* fix + enableParallelBuilding = false; crossAttrs = let isMingw = stdenv.cross.config == "i686-pc-mingw32" ||