mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Temporary fix for Vacuum-1.0.2 with Qt-4.7
svn path=/nixpkgs/trunk/; revision=24257
This commit is contained in:
parent
40c9c60211
commit
c8161ad799
@ -28,7 +28,12 @@ rec {
|
||||
inherit buildInputs;
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doQMake" "doMakeInstall"];
|
||||
phaseNames = ["preBuild" "doQMake" "doMakeInstall"];
|
||||
|
||||
preBuild = a.fullDepEntry (''
|
||||
echo "Fixing a name collision with a function added in Qt 4.7"
|
||||
sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp
|
||||
'') ["minInit" "doUnpack"];
|
||||
|
||||
goSrcDir = ''cd vacuum-*/'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user