From 64f945efd28bf8fc53bb161301b50066fd61cf53 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 30 Nov 2017 07:42:07 +0000 Subject: [PATCH] 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 bfaf7ae5aee2fdea952341911b68b54df7541c9c. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch | 6 +++--- 2 files changed, 4 insertions(+), 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 index a73f63bfb4b..a54860ff0ac 100644 --- 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 index d471bb2a665..5783543e844 100644 --- 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