From bd7e203fb16715abc2e7bec166b81fba309cf099 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Wed, 13 Dec 2023 19:59:04 -0500
Subject: [PATCH] fix(dracula): make wallpaper work again

---
 common/overlays/dracula-theme/default.nix    |  6 +++---
 common/overlays/dracula-theme/wallpaper.nix  | 21 ++------------------
 common/pkgs/pam-fprint-grosshack/default.nix |  4 ++--
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/common/overlays/dracula-theme/default.nix b/common/overlays/dracula-theme/default.nix
index f8af6408..aff160a2 100644
--- a/common/overlays/dracula-theme/default.nix
+++ b/common/overlays/dracula-theme/default.nix
@@ -3,8 +3,8 @@
     bat-colors = prev.callPackage ./bat.nix prev;
     git-colors = prev.callPackage ./git.nix prev;
     plymouth = prev.callPackage ./plymouth.nix prev;
-    wallpaper = prev.callPackage ./wallpaper.nix prev;
     Xresources = prev.callPackage ./xresources.nix prev;
+    wallpaper = prev.fetchurl (import ./wallpaper.nix);
   in {
     src = prev.fetchFromGitHub {
       owner = "dracula";
@@ -16,12 +16,12 @@
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out/share/plymouth/themes
+      mkdir -p $out/share/plymouth/themes $out/wallpapers
+      cp -a ${wallpaper} $out/wallpapers/waves.png
 
       cp -a ${bat-colors}/bat $out/bat
       cp -a ${git-colors}/git-colors $out/git-colors
       cp -a ${plymouth}/share/plymouth/themes/dracula $out/share/plymouth/themes/
-      cp -a ${wallpaper}/wallpapers $out/wallpapers
       cp -a ${Xresources}/xres $out/xres
 
       # -------------------------------------------
diff --git a/common/overlays/dracula-theme/wallpaper.nix b/common/overlays/dracula-theme/wallpaper.nix
index b300fca0..95cde496 100644
--- a/common/overlays/dracula-theme/wallpaper.nix
+++ b/common/overlays/dracula-theme/wallpaper.nix
@@ -1,21 +1,4 @@
 {
-  stdenv,
-  fetchurl,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "dracula-wallpaper";
-
-  src = fetchurl {
-    url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
-    hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
-  };
-
-  phases = ["installPhase"];
-
-  installPhase = ''
-    mv ./* ./waves.png
-    mkdir -p $out/wallpapers
-    cp -a ./waves.png $out/wallpapers
-  '';
+  url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
+  hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
 }
diff --git a/common/pkgs/pam-fprint-grosshack/default.nix b/common/pkgs/pam-fprint-grosshack/default.nix
index 21d4f2cf..e8252bdf 100644
--- a/common/pkgs/pam-fprint-grosshack/default.nix
+++ b/common/pkgs/pam-fprint-grosshack/default.nix
@@ -13,11 +13,11 @@
   fetchFromGitLab,
 }:
 stdenv.mkDerivation rec {
-  pname = "pam-fprint-grosshack";
+  name = "pam-fprint-grosshack";
 
   src = fetchFromGitLab {
     owner = "mishakmak";
-    repo = pname;
+    repo = name;
     rev = "45b42524fb5783e1e555067743d7e0f70d27888a";
     hash = "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=";
   };