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.
NixOS · Nov 30, 2017 · 64f945e · 64f945e
1 parent a8f3df2
commit 64f945e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 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
@@ -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 ";

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
@@ -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