alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "qt48: use tabs in the Makefile patch"

Browse source 
to apply a different fix, since the current one does not apply to Darwin.

This reverts commit bfaf7ae5ae.
This commit is contained in:
Orivej Desh 2017-11-30 07:42:07 +00:00
parent a8f3df29c6
commit 64f945efd2
2 changed files with 4 additions and 4 deletions
pkgs/development/libraries/qt-4.x/4.8
default.nixparallel-build.patch

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
postConfigure = ''
echo "applying patch ${./parallel-build.patch}"
patch -p1 -i ${./parallel-build.patch}
patch -p1 < ${./parallel-build.patch}
'';
prefixKey = "-prefix ";

6
pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch
View file

@ -1,6 +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
.uic/release-shared/ui_qtgradientviewdialog.h \
+ .uic/release-shared/ui_qtgradientview.h \
../../../shared/qtgradienteditor/qtgradientviewdialog.h