JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32173 from dtzWill/fix/qt48-parallel-patch-tabs

Browse Source 
qt48: match whitespace in context of patch to better apply on @dtzWill's tree and maybe future nixpkgs too
This commit is contained in:
Orivej Desh 2017-11-29 18:59:11 +00:00 committed by GitHub
commit 0c9ba0e149
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
postConfigure = ''
echo "applying patch ${./parallel-build.patch}"
patch -p1 < ${./parallel-build.patch}
patch -p1 -i ${./parallel-build.patch}
'';
prefixKey = "-prefix ";

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

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