mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 06:14:26 +03:00
qt4: delete parallel-build.patch to replace with a generic fix
This commit is contained in:
parent
d7fb709180
commit
c8d822252b
@ -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 =
|
||||
|
@ -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
|
@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
|
||||
rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
|
||||
sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
|
||||
};
|
||||
postConfigure = ""; # The patch "parallel-build.patch" does not apply.
|
||||
configureFlags =
|
||||
''
|
||||
-dbus-linked
|
||||
|
Loading…
Reference in New Issue
Block a user