From 8c5b1946bce7cd4c23f18af1b83e44e135656c25 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Tue, 6 Oct 2020 16:00:18 +0800
Subject: [PATCH 1/2] maintainer: add vonfry

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 009d938554c..7057159c115 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9088,6 +9088,12 @@
     githubId = 508305;
     name = "Jaroslavas Pocepko";
   };
+  vonfry = {
+    email = "nixos@vonfry.name";
+    github = "Vonfry";
+    githubId = 3413119;
+    name = "Vonfry";
+  };
   vozz = {
     email = "oliver.huntuk@gmail.com";
     name = "Oliver Hunt";

From 0f1be681168c4cc8609ce1fd31cbad6639056aa5 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Tue, 6 Oct 2020 16:13:57 +0800
Subject: [PATCH 2/2] dracula-theme: rename ant-dracula-theme to dracula-theme
 and update

---
 pkgs/data/themes/ant-theme/ant-dracula.nix | 34 --------------------
 pkgs/data/themes/dracula-theme/default.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/aliases.nix                 |  3 ++
 pkgs/top-level/all-packages.nix            |  2 +-
 4 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/data/themes/ant-theme/ant-dracula.nix
 create mode 100644 pkgs/data/themes/dracula-theme/default.nix

diff --git a/pkgs/data/themes/ant-theme/ant-dracula.nix b/pkgs/data/themes/ant-theme/ant-dracula.nix
deleted file mode 100644
index e365ab94c30..00000000000
--- a/pkgs/data/themes/ant-theme/ant-dracula.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, gtk-engine-murrine }:
-
-let
-  themeName = "Ant-Dracula";
-in
-stdenv.mkDerivation rec {
-  pname = "ant-dracula-theme";
-  version = "1.3.0";
-
-  src = fetchurl {
-    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
-    sha256 = "00b8w69xapqy8kc7zqwlfz1xpld6hibbh35djvhcnd905gzzymkd";
-  };
-
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/themes/${themeName}
-    cp -a * $out/share/themes/${themeName}
-    rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
-    runHook postInstall
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Dracula variant of the Ant theme";
-    homepage = "https://github.com/EliverLara/${themeName}";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ alexarice ];
-  };
-}
diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix
new file mode 100644
index 00000000000..87afbedf8fb
--- /dev/null
+++ b/pkgs/data/themes/dracula-theme/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+let
+  themeName = "Dracula";
+  version = "2.0";
+in
+stdenv.mkDerivation {
+  pname = "dracula-theme";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "dracula";
+    repo = "gtk";
+    rev = "v${version}";
+    sha256 = "10j706gnhdplhykdisp64vzzxpzgn48b5f1fkndcp340x7hf2mf3";
+  };
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/themes/${themeName}
+    cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,kde,metacity-1,unity,xfwm4} $out/share/themes/${themeName}
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Dracula variant of the Ant theme";
+    homepage = "https://github.com/dracula/gtk";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ alexarice vonfry ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 645d70bc316..bed9fad8edf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -738,4 +738,7 @@ mapAliases ({
   /* Cleanup before 21.03 */
   riot-desktop = throw "riot-desktop is now element-desktop!";
   riot-web = throw "riot-web is now element-web";
+
+  ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
+
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567d4d08d21..029a96cdaca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18767,7 +18767,7 @@ in
 
   ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };
 
-  ant-dracula-theme = callPackage ../data/themes/ant-theme/ant-dracula.nix { };
+  dracula-theme = callPackage ../data/themes/dracula-theme { };
 
   ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { };