Unverified Commit 7e6f67dc authored by Daylin Morgan's avatar Daylin Morgan
Browse files

catppuccin-gtk: fix git reset behavior to support multiple accents 

The default build scripts assume the dependent theme colloid-gtk
is a git submodule and uses subprocesses to perform git reset in order
to support multiple outputs.

This instead backs up the starting state in a separate directory and
overwrites before generating a new color.
parent 54c52cb2

pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
diff --git a/scripts/create_theme.py b/scripts/create_theme.py

index 074dc43..7e7a8eb 100644

--- a/scripts/create_theme.py

+++ b/scripts/create_theme.py

@@ -34,7 +34,11 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F

             os.chdir(work_dir)

             subprocess.call("./build.sh", shell=True) # Rebuild all scss

             subprocess.call(install_cmd, shell=True) # Install the theme globally for you

-            subprocess.call("git reset --hard HEAD", shell=True)  # reset colloid repo to original state

+            # subprocess.call("git reset --hard HEAD", shell=True)  # reset colloid repo to original state

+            # recreate git reset

+            os.chdir(repo_dir)

+            shutil.rmtree("colloid")

+            shutil.copytree("colloid-base", "colloid")

 

             try:

                 # Rename colloid generated files as per catppuccin

pkgs/data/themes/catppuccin-gtk/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ stdenvNoCC.mkDerivation rec { 


  nativeBuildInputs = [ gtk3 sassc ];



  patches = [

    ./colloid-src-git-reset.patch

  ];



  buildInputs = [

    gnome-themes-extra

    (python3.withPackages (ps: [ ps.catppuccin ]))
@@ -54,7 +58,7 @@ stdenvNoCC.mkDerivation rec { 
  '';



  postPatch = ''

    patchShebangs --build colloid/install.sh

    patchShebangs --build colloid/install.sh colloid/build.sh

  '';



  dontConfigure = true;
@@ -63,6 +67,7 @@ stdenvNoCC.mkDerivation rec { 
  installPhase = ''

    runHook preInstall



    cp -r colloid colloid-base

    mkdir -p $out/share/themes

    export HOME=$(mktemp -d)