qt4: delete parallel-build.patch to replace with a generic fix

2017-11-30 09:30:24 +00:00
parent d7fb709180
commit c8d822252b
3 changed files with 0 additions and 12 deletions
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -126,11 +126,6 @@ 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 =
--- 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 +0,0 @@
--- 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