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 <file>..." to unstage) # # modified: pkgs/development/libraries/qt-4.x/4.8/default.nix # # Untracked files: # (use "git add <file>..." 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
This commit is contained in:
parent
c72ed04892
commit
cba6d9b11a
1 changed files with 3 additions and 7 deletions
|
@ -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" ||
|
||||
|
|
Loading…
Reference in a new issue