From 2ad681bc4642aef880a4104acc3a89d16fad1ded Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Sat, 20 Aug 2022 13:03:00 +0800
Subject: [PATCH] gradience: 0.1.0 -> unstable-2022-08-20

Also `adwcustomizer` has been renamed into `gradience` to catch up with
the upstream.
---
 .../patches/update-non-flatpak-env.patch      | 16 ------
 pkgs/default.nix                              |  2 +-
 pkgs/{adwcustomizer => gradience}/default.nix | 50 ++++++++-----------
 3 files changed, 23 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/adwcustomizer/patches/update-non-flatpak-env.patch
 rename pkgs/{adwcustomizer => gradience}/default.nix (72%)

diff --git a/pkgs/adwcustomizer/patches/update-non-flatpak-env.patch b/pkgs/adwcustomizer/patches/update-non-flatpak-env.patch
deleted file mode 100644
index f0d9678a..00000000
--- a/pkgs/adwcustomizer/patches/update-non-flatpak-env.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/main.py b/src/main.py
-index 8aadfe0..d2c5d4c 100644
---- a/src/main.py
-+++ b/src/main.py
-@@ -369,5 +369,10 @@ class AdwcustomizerApplication(Adw.Application):
- 
- def main(version):
-     """The application's entry point."""
--    app = AdwcustomizerApplication(version)
-+    if not os.getenv("XDG_CONFIG_HOME"):
-+        os.environ["XDG_CONFIG_HOME"] = os.path.expanduser("~/.config")
-+        app_config = os.path.join(os.environ["XDG_CONFIG_HOME"], "adwcustomizer")
-+        os.makedirs(app_config, exist_ok=True)
-+
-+    app = AdwcustomizerApplication(version)
-     return app.run(sys.argv)
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4d68870f..6ad68124 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,7 +6,6 @@ let
   packages = self:
     let callPackage = newScope self;
     in rec {
-      adwcustomizer = callPackage ./adwcustomizer { libadwaita = libadwaita-latest; };
       artem = callPackage ./artem.nix { };
       auto-editor = callPackage ./auto-editor.nix { };
       awesome-cli = callPackage ./awesome-cli { };
@@ -26,6 +25,7 @@ let
         callPackage ./gnome-shell-extension-fly-pie.nix { };
       gnome-shell-extension-pop-shell =
         callPackage ./gnome-shell-extension-pop-shell.nix { };
+      gradience = callPackage ./gradience { libadwaita = libadwaita-latest; };
       guile-config = callPackage ./guile-config.nix { };
       guile-hall = callPackage ./guile-hall.nix { };
       hush-shell = callPackage ./hush-shell.nix { };
diff --git a/pkgs/adwcustomizer/default.nix b/pkgs/gradience/default.nix
similarity index 72%
rename from pkgs/adwcustomizer/default.nix
rename to pkgs/gradience/default.nix
index 62b64273..4e8fb2a9 100644
--- a/pkgs/adwcustomizer/default.nix
+++ b/pkgs/gradience/default.nix
@@ -8,6 +8,7 @@
 , glib
 , desktop-file-utils
 , gettext
+, librsvg
 , blueprint-compiler
 , python3Packages
 , appstream-glib
@@ -16,60 +17,53 @@
 , libportal
 , libportal-gtk4
 , gobject-introspection
+, python-material-color-utilities
 }:
 
 # Not all parts of the application works with the current nixpkgs version of
 # libadwaita.
 python3Packages.buildPythonApplication rec {
   pname = "adwcustomizer";
-  version = "0.1.0";
+  version = "unstable-2022-08-20";
 
   src = fetchFromGitHub {
     owner = "AdwCustomizerTeam";
     repo = "AdwCustomizer";
-    rev = version;
-    sha256 = "sha256-3VHGk27MIgu+15OQeEmX8zfTCj/TtFtVv3Cf/iXxb/c=";
+    rev = "4ad3759a3cd7e034cd6c23fd5bfd2c2e1f3623ef";
+    sha256 = "sha256-Z6fYAXr5HEoLxmlGfLToF7WXPoJGaQmLQHH7oG333Wo=";
   };
 
-  patches = [
-    ./patches/update-non-flatpak-env.patch
-  ];
-
   format = "other";
   dontWrapGApps = true;
 
-  postInstall = ''
-    python -m pip install $src/monet/*.whl --no-cache --no-index --no-warn-script-location --prefix="$out" $pipInstallFlags
-  '';
-
   nativeBuildInputs = [
-    wrapGAppsHook4
+    appstream-glib
+    blueprint-compiler
+    desktop-file-utils
+    gettext
+    glib
+    gobject-introspection
     meson
     ninja
     pkg-config
-    desktop-file-utils
-    gettext
-    blueprint-compiler
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
     gtk4
-  ];
-
-  propagatedNativeBuildInputs = [
-    gobject-introspection
-    appstream-glib
-    glib
-  ];
-
-  propagatedBuildInputs = [
     libadwaita
     libportal
     libportal-gtk4
-  ] ++ (with python3Packages; [
+    librsvg
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
     pygobject3
     anyascii
-    pillow
     pip
-    regex
-  ]);
+  ] ++ [
+    python-material-color-utilities
+  ];
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")