From 72a8329ee2a598bd28787f276ccafa959fe60875 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 2 Feb 2014 07:43:30 +0200 Subject: [PATCH] vidalia: fix build with gcc-4.7 --- pkgs/tools/security/vidalia/default.nix | 2 ++ pkgs/tools/security/vidalia/gcc-4.7.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/tools/security/vidalia/gcc-4.7.patch diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 4d216bee0b60..6ce094997806 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 doxygen ]; + patches = [ ./gcc-4.7.patch ]; + meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; diff --git a/pkgs/tools/security/vidalia/gcc-4.7.patch b/pkgs/tools/security/vidalia/gcc-4.7.patch new file mode 100644 index 000000000000..4c163af760c6 --- /dev/null +++ b/pkgs/tools/security/vidalia/gcc-4.7.patch @@ -0,0 +1,12 @@ +diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp +--- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp 2012-08-08 18:02:01.901732270 +0200 ++++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp 2012-08-08 18:03:26.241677875 +0200 +@@ -20,6 +20,8 @@ + + #include "Vidalia.h" + ++#include ++ + PluginEngine::PluginEngine(QObject *parent) + : QScriptEngine(parent) + {