swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Orivej Desh 2017-11-30 09:30:24 +00:00
parent d7fb709180
commit c8d822252b
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/qt-4.x/4.8/default.nix
View file

@ -126,11 +126,6 @@ stdenv.mkDerivation rec {
sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf 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 "; prefixKey = "-prefix ";
configureFlags = configureFlags =

6
pkgs/development/libraries/qt-4.x/4.8/parallel-build.patch
View file

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

1
pkgs/tools/graphics/wkhtmltopdf/default.nix
View file

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
}; };
postConfigure = ""; # The patch "parallel-build.patch" does not apply.
configureFlags = configureFlags =
'' ''
-dbus-linked -dbus-linked