From c8161ad799aca54558dab55d683b8d8195beca95 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 12 Oct 2010 23:15:25 +0000 Subject: Temporary fix for Vacuum-1.0.2 with Qt-4.7 svn path=/nixpkgs/trunk/; revision=24257 --- pkgs/applications/networking/instant-messengers/vacuum/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/networking') 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-*/''; -- cgit 1.4.1