diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-29 09:02:37 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-29 09:08:44 +0000 |
| commit | a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e (patch) | |
| tree | 4fe82f20015ca23414e99c35ab3d557fb00e99c9 /pkgs/development/libraries/qt-4.x | |
| parent | 8b0ef2a5644fc0cd7d4627b8eb6f2bc3ee355ad6 (diff) | |
| download | nixpkgs-a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e.tar nixpkgs-a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e.tar.gz nixpkgs-a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e.tar.bz2 nixpkgs-a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e.tar.lz nixpkgs-a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e.tar.xz nixpkgs-a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e.tar.zst nixpkgs-a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e.zip | |
qt4: fix parallel building of moc_qtgradientviewdialog.o
Previously the last of these commands:
```
make -j sub-tools-bootstrap
make -j sub-uic sub-moc sub-rcc
make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o
```
failed with this error:
```
In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0,
from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47,
from .moc/release-shared/moc_qtgradientviewdialog.cpp:9:
../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory
```
because uic did not ensure that the build of moc_qtgradientviewdialog.o happens
after the build of moc_qtgradientview.o.
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch | 6 |
2 files changed, 11 insertions, 0 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 66a58dba32e..a54860ff0ac 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -126,6 +126,11 @@ stdenv.mkDerivation rec { sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf ''; + postConfigure = '' + echo "applying patch ${./parallel-build.patch}" + patch -p1 < ${./parallel-build.patch} + ''; + prefixKey = "-prefix "; configureFlags = diff --git a/pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch b/pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch new file mode 100644 index 00000000000..5783543e844 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch @@ -0,0 +1,6 @@ +--- a/tools/designer/src/lib/Makefile ++++ b/tools/designer/src/lib/Makefile +@@ -7167,2 +7167,3 @@ compiler_moc_header_clean: + .uic/release-shared/ui_qtgradientviewdialog.h \ ++ .uic/release-shared/ui_qtgradientview.h \ + ../../../shared/qtgradienteditor/qtgradientviewdialog.h |