Author: raskin
Date: Tue Oct 12 23:15:25 2010
New Revision: 24257
URL: https://svn.nixos.org/websvn/nix/?rev=24257&sc=1
Log:
Temporary fix for Vacuum-1.0.2 with Qt-4.7
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
Tue Oct 12 22:12:54 2010 (r24256)
+++
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/vacuum/default.nix
Tue Oct 12 23:15:25 2010 (r24257)
@@ -28,7 +28,12 @@
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-*/'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
