Skip to content

Commit 64f945e

Browse files
committedNov 30, 2017
Revert "qt48: use tabs in the Makefile patch"
to apply a different fix, since the current one does not apply to Darwin. This reverts commit bfaf7ae.
1 parent a8f3df2 commit 64f945e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎pkgs/development/libraries/qt-4.x/4.8/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
128128

129129
postConfigure = ''
130130
echo "applying patch ${./parallel-build.patch}"
131-
patch -p1 -i ${./parallel-build.patch}
131+
patch -p1 < ${./parallel-build.patch}
132132
'';
133133

134134
prefixKey = "-prefix ";
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/tools/designer/src/lib/Makefile
22
+++ b/tools/designer/src/lib/Makefile
33
@@ -7167,2 +7167,3 @@ compiler_moc_header_clean:
4-
.uic/release-shared/ui_qtgradientviewdialog.h \
5-
+ .uic/release-shared/ui_qtgradientview.h \
6-
../../../shared/qtgradienteditor/qtgradientviewdialog.h
4+
.uic/release-shared/ui_qtgradientviewdialog.h \
5+
+ .uic/release-shared/ui_qtgradientview.h \
6+
../../../shared/qtgradienteditor/qtgradientviewdialog.h

0 commit comments

Comments
 (0)