diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-30 09:30:24 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-11-30 09:51:14 +0000 |
commit | c8d822252b86022a71dcc4f0f48bc869ef446401 (patch) | |
tree | dfe3e86f42e798704abbc0c81015288fe81f9722 /pkgs/development/libraries/qt-4.x | |
parent | d7fb70918041028845740f3a89d8b2694645bfc0 (diff) |
qt4: delete parallel-build.patch to replace with a generic fix
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch | 6 |
2 files changed, 0 insertions, 11 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 a54860ff0ac8a..66a58dba32e22 100644 --- 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 = 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 deleted file mode 100644 index 5783543e8449e..0000000000000 --- a/pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch +++ /dev/null @@ -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 |