From b09ab584f0f75aa79c187f703d0812cc35c47578 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 30 Aug 2017 23:59:59 +0200
Subject: [PATCH] vidalia: remove

closes #28753
---
 pkgs/tools/security/vidalia/default.nix   | 24 -----------------------
 pkgs/tools/security/vidalia/gcc-4.7.patch | 12 ------------
 pkgs/top-level/all-packages.nix           |  2 --
 3 files changed, 38 deletions(-)
 delete mode 100644 pkgs/tools/security/vidalia/default.nix
 delete 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
deleted file mode 100644
index fc1d98806f08..000000000000
--- a/pkgs/tools/security/vidalia/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, doxygen }:
-stdenv.mkDerivation rec {
-
-  name = "vidalia-${version}";
-  version = "0.3.1";
-
-  src = fetchurl {
-    url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
-    sha256 = "1mw3wnlh18rj20qjv7jxjk3a8mf75p5wzv358qfs3sm3lqgd68qm";
-  };
-
-  buildInputs = [ cmake qt4 doxygen ];
-
-  patches = [ ./gcc-4.7.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://www.torproject.org/projects/vidalia.html.en;
-    repositories.git = https://git.torproject.org/vidalia;
-    description = "A cross-platform graphical controller for the Tor software, built using the Qt framework";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/security/vidalia/gcc-4.7.patch b/pkgs/tools/security/vidalia/gcc-4.7.patch
deleted file mode 100644
index 4c163af760c6..000000000000
--- a/pkgs/tools/security/vidalia/gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 <unistd.h>
-+
- PluginEngine::PluginEngine(QObject *parent)
-   : QScriptEngine(parent)
- {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c059fd61d4ca..bb29decfcb74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4668,8 +4668,6 @@ with pkgs;
 
   volatility = callPackage ../tools/security/volatility { };
 
-  vidalia = callPackage ../tools/security/vidalia { };
-
   vbetool = callPackage ../tools/system/vbetool { };
 
   vde2 = callPackage ../tools/networking/vde2 { };