diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-10-12 23:15:25 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-10-12 23:15:25 +0000 |
| commit | c8161ad799aca54558dab55d683b8d8195beca95 (patch) | |
| tree | 12d2b9c569b67918856b315c446a6402406d31dd /pkgs/applications/networking/instant-messengers/vacuum | |
| parent | 40c9c602111d7e7e608c08884fcfdf8b9c74156d (diff) | |
Temporary fix for Vacuum-1.0.2 with Qt-4.7
svn path=/nixpkgs/trunk/; revision=24257
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/vacuum')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/vacuum/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 5d5aed592fd5b..a08cc2795bbb7 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -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-*/''; |