From 89bdfaa08cd1ebd6892841d08fe86b87b85029d6 Mon Sep 17 00:00:00 2001
From: Ian McFarlane <i.mcfarlane2002@gmail.com>
Date: Tue, 3 Jan 2023 11:16:13 -0600
Subject: [PATCH 1/8] rose-pine-gtk: unstable-2021-02-22 -> unstable-2022-09-01

---
 pkgs/data/icons/rose-pine/default.nix      | 48 ++++++++++++++++++++++
 pkgs/data/themes/rose-pine-gtk/default.nix | 34 +++++++++++----
 pkgs/top-level/all-packages.nix            |  5 +++
 3 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/data/icons/rose-pine/default.nix

diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix
new file mode 100644
index 000000000000..0aee480fb76a
--- /dev/null
+++ b/pkgs/data/icons/rose-pine/default.nix
@@ -0,0 +1,48 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  variant ? "default",
+}: let
+  source-locations = {
+    default = "icons/rose-pine-icons";
+    moon = "icons/rose-pine-moon-icons";
+    dawn = "icons/rose-pine-dawn-icons";
+  };
+
+  source-location =
+    if builtins.hasAttr variant source-locations
+    then source-locations.${variant}
+    else abort "unknown rose-pine variant ${variant}";
+in
+  stdenv.mkDerivation rec {
+    pname = "rose-pine-${variant}-icon-theme";
+    version = "unstable-2022-09-01";
+
+    src = fetchFromGitHub {
+      owner = "rose-pine";
+      repo = "gtk";
+      rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
+      sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
+    };
+
+    # avoid the makefile which is only for the theme maintainers
+    dontBuild = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/share/icons
+      mv ${source-location} $out/share/icons/rose-pine
+
+      runHook postInstall
+    '';
+
+    meta = with lib; {
+      description = "Rosé Pine icon theme for GTK";
+      homepage = "https://github.com/rose-pine/gtk";
+      license = licenses.gpl3Only;
+      platforms = platforms.linux;
+      maintainers = [maintainers.romildo];
+    };
+  }
diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix
index d139876e1429..7cbe2d36e192 100644
--- a/pkgs/data/themes/rose-pine-gtk/default.nix
+++ b/pkgs/data/themes/rose-pine-gtk/default.nix
@@ -4,17 +4,28 @@
 , gnome-themes-extra
 , gtk-engine-murrine
 , gtk_engines
-}:
+, variant ? "default"
+}: let
+  source-locations = {
+    default = "gtk3/rose-pine-gtk";
+    moon = "gtk3/rose-pine-moon-gtk";
+    dawn = "gtk3/rose-pine-dawn-gtk";
+  };
 
+  source-location =
+    if builtins.hasAttr variant source-locations
+    then source-locations.${variant}
+    else abort "unknown rose-pine variant ${variant}";
+in
 stdenv.mkDerivation rec {
-  pname = "rose-pine-gtk-theme";
-  version = "unstable-2021-02-22";
+  pname = "rose-pine-${variant}-gtk-theme";
+  version = "unstable-2022-09-01";
 
   src = fetchFromGitHub {
     owner = "rose-pine";
     repo = "gtk";
-    rev = "9cd2dd449f911973ec549231a57a070d256da9fd";
-    sha256 = "0lqx8dmv754ix3xbg7h440x964n0bg4lb06vbzvsydnbx79h7lvy";
+    rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
+    sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
   };
 
   buildInputs = [
@@ -26,11 +37,20 @@ stdenv.mkDerivation rec {
     gtk-engine-murrine # murrine engine for Gtk2
   ];
 
+  # avoid the makefile which is only for theme maintainers
+  dontBuild = true;
+
   installPhase = ''
     runHook preInstall
+
     mkdir -p $out/share/themes
-    cp -a Rose-Pine $out/share/themes
-    rm $out/share/themes/*/LICENSE
+    mv ${source-location} $out/share/themes/rose-pine
+    ${
+    if variant == "moon"
+    then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine"
+    else ""
+    }
+
     runHook postInstall
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 104f8eef991a..9e3392ff47f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27195,6 +27195,11 @@ with pkgs;
   roapi-http = callPackage ../servers/roapi/http.nix { };
 
   rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { };
+  rose-pine-dawn-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "dawn"; };
+  rose-pine-moon-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "moon"; };
+  rose-pine-icon-theme = callPackage ../data/icons/rose-pine { };
+  rose-pine-dawn-icon-theme = callPackage ../data/icons/rose-pine { variant = "dawn"; };
+  rose-pine-moon-icon-theme = callPackage ../data/icons/rose-pine { variant = "moon"; };
 
   route159 = callPackage ../data/fonts/route159 { };
 

From f18cbacce4909f4726ecf52deae3efe0fc797edb Mon Sep 17 00:00:00 2001
From: Ian McFarlane <i.mcfarlane2002@gmail.com>
Date: Tue, 3 Jan 2023 11:34:49 -0600
Subject: [PATCH 2/8] maintainers: add the-argus

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f384f6835820..2c49d29a23b0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13907,6 +13907,13 @@
       fingerprint = "D2A2 F0A1 E7A8 5E6F B711  DEE5 63A4 4817 A52E AB7B";
     }];
   };
+  the-argus = {
+    email = "i.mcfarlane2002@gmail.com";
+    github = "the-argus";
+    name = "Ian McFarlane";
+    githubId = 70479099;
+    matrix = "@eyes1238:matrix.org";
+  };
   TheBrainScrambler = {
     email = "esthromeris@riseup.net";
     github = "TheBrainScrambler";

From 0d1d1250338f28da06b21aada80f6f734d2e99c2 Mon Sep 17 00:00:00 2001
From: Ian McFarlane <i.mcfarlane2002@gmail.com>
Date: Tue, 3 Jan 2023 11:38:31 -0600
Subject: [PATCH 3/8] rose-pine-gtk: add the-argus as a maintainer

---
 pkgs/data/icons/rose-pine/default.nix      | 2 +-
 pkgs/data/themes/rose-pine-gtk/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix
index 0aee480fb76a..73571a538dc3 100644
--- a/pkgs/data/icons/rose-pine/default.nix
+++ b/pkgs/data/icons/rose-pine/default.nix
@@ -43,6 +43,6 @@ in
       homepage = "https://github.com/rose-pine/gtk";
       license = licenses.gpl3Only;
       platforms = platforms.linux;
-      maintainers = [maintainers.romildo];
+      maintainers = with maintainers; [romildo the-argus];
     };
   }
diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix
index 7cbe2d36e192..f40916ff063e 100644
--- a/pkgs/data/themes/rose-pine-gtk/default.nix
+++ b/pkgs/data/themes/rose-pine-gtk/default.nix
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/rose-pine/gtk";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = [ maintainers.romildo ];
+    maintainers = with maintainers; [ romildo the-argus ];
   };
 }

From 99a82dd360635933294b9b1b09106983b3d284f9 Mon Sep 17 00:00:00 2001
From: Ian McFarlane <i.mcfarlane2002@gmail.com>
Date: Tue, 3 Jan 2023 11:39:02 -0600
Subject: [PATCH 4/8] rose-pine-gtk: format

---
 pkgs/data/themes/rose-pine-gtk/default.nix | 89 +++++++++++-----------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix
index f40916ff063e..25ba5f121a89 100644
--- a/pkgs/data/themes/rose-pine-gtk/default.nix
+++ b/pkgs/data/themes/rose-pine-gtk/default.nix
@@ -1,10 +1,11 @@
-{ stdenv
-, fetchFromGitHub
-, lib
-, gnome-themes-extra
-, gtk-engine-murrine
-, gtk_engines
-, variant ? "default"
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  gnome-themes-extra,
+  gtk-engine-murrine,
+  gtk_engines,
+  variant ? "default",
 }: let
   source-locations = {
     default = "gtk3/rose-pine-gtk";
@@ -17,48 +18,48 @@
     then source-locations.${variant}
     else abort "unknown rose-pine variant ${variant}";
 in
-stdenv.mkDerivation rec {
-  pname = "rose-pine-${variant}-gtk-theme";
-  version = "unstable-2022-09-01";
+  stdenv.mkDerivation rec {
+    pname = "rose-pine-${variant}-gtk-theme";
+    version = "unstable-2022-09-01";
 
-  src = fetchFromGitHub {
-    owner = "rose-pine";
-    repo = "gtk";
-    rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
-    sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
-  };
+    src = fetchFromGitHub {
+      owner = "rose-pine";
+      repo = "gtk";
+      rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
+      sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
+    };
 
-  buildInputs = [
-    gnome-themes-extra # adwaita engine for Gtk2
-    gtk_engines # pixmap engine for Gtk2
-  ];
+    buildInputs = [
+      gnome-themes-extra # adwaita engine for Gtk2
+      gtk_engines # pixmap engine for Gtk2
+    ];
 
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine # murrine engine for Gtk2
-  ];
+    propagatedUserEnvPkgs = [
+      gtk-engine-murrine # murrine engine for Gtk2
+    ];
 
-  # avoid the makefile which is only for theme maintainers
-  dontBuild = true;
+    # avoid the makefile which is only for theme maintainers
+    dontBuild = true;
 
-  installPhase = ''
-    runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-    mkdir -p $out/share/themes
-    mv ${source-location} $out/share/themes/rose-pine
-    ${
-    if variant == "moon"
-    then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine"
-    else ""
-    }
+      mkdir -p $out/share/themes
+      mv ${source-location} $out/share/themes/rose-pine
+      ${
+        if variant == "moon"
+        then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine"
+        else ""
+      }
 
-    runHook postInstall
-  '';
+      runHook postInstall
+    '';
 
-  meta = with lib; {
-    description = "Rosé Pine theme for GTK";
-    homepage = "https://github.com/rose-pine/gtk";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo the-argus ];
-  };
-}
+    meta = with lib; {
+      description = "Rosé Pine theme for GTK";
+      homepage = "https://github.com/rose-pine/gtk";
+      license = licenses.gpl3Only;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [romildo the-argus];
+    };
+  }

From ab43cc69fa5621c7f728ee0a58ce88d226ac61f4 Mon Sep 17 00:00:00 2001
From: Ian McFarlane <i.mcfarlane2002@gmail.com>
Date: Thu, 12 Jan 2023 22:56:42 -0600
Subject: [PATCH 5/8] rose-pine-gtk: squash variants into one package

---
 pkgs/data/icons/rose-pine/default.nix      | 20 +++++------------
 pkgs/data/themes/rose-pine-gtk/default.nix | 26 +++++-----------------
 pkgs/top-level/all-packages.nix            |  4 ----
 3 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix
index 73571a538dc3..a19b786f4ee8 100644
--- a/pkgs/data/icons/rose-pine/default.nix
+++ b/pkgs/data/icons/rose-pine/default.nix
@@ -2,21 +2,9 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  variant ? "default",
-}: let
-  source-locations = {
-    default = "icons/rose-pine-icons";
-    moon = "icons/rose-pine-moon-icons";
-    dawn = "icons/rose-pine-dawn-icons";
-  };
-
-  source-location =
-    if builtins.hasAttr variant source-locations
-    then source-locations.${variant}
-    else abort "unknown rose-pine variant ${variant}";
-in
+}:
   stdenv.mkDerivation rec {
-    pname = "rose-pine-${variant}-icon-theme";
+    pname = "rose-pine-icon-theme";
     version = "unstable-2022-09-01";
 
     src = fetchFromGitHub {
@@ -33,7 +21,9 @@ in
       runHook preInstall
 
       mkdir -p $out/share/icons
-      mv ${source-location} $out/share/icons/rose-pine
+      mv icons/rose-pine-icons $out/share/icons/rose-pine
+      mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn
+      mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon
 
       runHook postInstall
     '';
diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix
index 25ba5f121a89..309b115d6bef 100644
--- a/pkgs/data/themes/rose-pine-gtk/default.nix
+++ b/pkgs/data/themes/rose-pine-gtk/default.nix
@@ -4,20 +4,8 @@
   lib,
   gnome-themes-extra,
   gtk-engine-murrine,
-  gtk_engines,
-  variant ? "default",
-}: let
-  source-locations = {
-    default = "gtk3/rose-pine-gtk";
-    moon = "gtk3/rose-pine-moon-gtk";
-    dawn = "gtk3/rose-pine-dawn-gtk";
-  };
-
-  source-location =
-    if builtins.hasAttr variant source-locations
-    then source-locations.${variant}
-    else abort "unknown rose-pine variant ${variant}";
-in
+  gtk_engines
+}:
   stdenv.mkDerivation rec {
     pname = "rose-pine-${variant}-gtk-theme";
     version = "unstable-2022-09-01";
@@ -45,12 +33,10 @@ in
       runHook preInstall
 
       mkdir -p $out/share/themes
-      mv ${source-location} $out/share/themes/rose-pine
-      ${
-        if variant == "moon"
-        then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine"
-        else ""
-      }
+      mv gtk3/rose-pine-gtk $out/share/themes/rose-pine
+      mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon
+      mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn
+      mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon
 
       runHook postInstall
     '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e3392ff47f1..a0dba17464ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27195,11 +27195,7 @@ with pkgs;
   roapi-http = callPackage ../servers/roapi/http.nix { };
 
   rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { };
-  rose-pine-dawn-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "dawn"; };
-  rose-pine-moon-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "moon"; };
   rose-pine-icon-theme = callPackage ../data/icons/rose-pine { };
-  rose-pine-dawn-icon-theme = callPackage ../data/icons/rose-pine { variant = "dawn"; };
-  rose-pine-moon-icon-theme = callPackage ../data/icons/rose-pine { variant = "moon"; };
 
   route159 = callPackage ../data/fonts/route159 { };
 

From e02cd8e9286fbbf27afefbc6032b4f035cca242d Mon Sep 17 00:00:00 2001
From: Ian McFarlane <i.mcfarlane2002@gmail.com>
Date: Thu, 12 Jan 2023 22:58:33 -0600
Subject: [PATCH 6/8] rose-pine-gtk: format

---
 pkgs/data/icons/rose-pine/default.nix      | 54 ++++++++--------
 pkgs/data/themes/rose-pine-gtk/default.nix | 72 +++++++++++-----------
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix
index a19b786f4ee8..6ce6f1d59a33 100644
--- a/pkgs/data/icons/rose-pine/default.nix
+++ b/pkgs/data/icons/rose-pine/default.nix
@@ -3,36 +3,36 @@
   lib,
   fetchFromGitHub,
 }:
-  stdenv.mkDerivation rec {
-    pname = "rose-pine-icon-theme";
-    version = "unstable-2022-09-01";
+stdenv.mkDerivation rec {
+  pname = "rose-pine-icon-theme";
+  version = "unstable-2022-09-01";
 
-    src = fetchFromGitHub {
-      owner = "rose-pine";
-      repo = "gtk";
-      rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
-      sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
-    };
+  src = fetchFromGitHub {
+    owner = "rose-pine";
+    repo = "gtk";
+    rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
+    sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
+  };
 
-    # avoid the makefile which is only for the theme maintainers
-    dontBuild = true;
+  # avoid the makefile which is only for the theme maintainers
+  dontBuild = true;
 
-    installPhase = ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/share/icons
-      mv icons/rose-pine-icons $out/share/icons/rose-pine
-      mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn
-      mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon
+    mkdir -p $out/share/icons
+    mv icons/rose-pine-icons $out/share/icons/rose-pine
+    mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn
+    mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
-    meta = with lib; {
-      description = "Rosé Pine icon theme for GTK";
-      homepage = "https://github.com/rose-pine/gtk";
-      license = licenses.gpl3Only;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [romildo the-argus];
-    };
-  }
+  meta = with lib; {
+    description = "Rosé Pine icon theme for GTK";
+    homepage = "https://github.com/rose-pine/gtk";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [romildo the-argus];
+  };
+}
diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix
index 309b115d6bef..8398373756f8 100644
--- a/pkgs/data/themes/rose-pine-gtk/default.nix
+++ b/pkgs/data/themes/rose-pine-gtk/default.nix
@@ -4,48 +4,48 @@
   lib,
   gnome-themes-extra,
   gtk-engine-murrine,
-  gtk_engines
+  gtk_engines,
 }:
-  stdenv.mkDerivation rec {
-    pname = "rose-pine-${variant}-gtk-theme";
-    version = "unstable-2022-09-01";
+stdenv.mkDerivation rec {
+  pname = "rose-pine-${variant}-gtk-theme";
+  version = "unstable-2022-09-01";
 
-    src = fetchFromGitHub {
-      owner = "rose-pine";
-      repo = "gtk";
-      rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
-      sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
-    };
+  src = fetchFromGitHub {
+    owner = "rose-pine";
+    repo = "gtk";
+    rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
+    sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
+  };
 
-    buildInputs = [
-      gnome-themes-extra # adwaita engine for Gtk2
-      gtk_engines # pixmap engine for Gtk2
-    ];
+  buildInputs = [
+    gnome-themes-extra # adwaita engine for Gtk2
+    gtk_engines # pixmap engine for Gtk2
+  ];
 
-    propagatedUserEnvPkgs = [
-      gtk-engine-murrine # murrine engine for Gtk2
-    ];
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine # murrine engine for Gtk2
+  ];
 
-    # avoid the makefile which is only for theme maintainers
-    dontBuild = true;
+  # avoid the makefile which is only for theme maintainers
+  dontBuild = true;
 
-    installPhase = ''
-      runHook preInstall
+  installPhase = ''
+    runHook preInstall
 
-      mkdir -p $out/share/themes
-      mv gtk3/rose-pine-gtk $out/share/themes/rose-pine
-      mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon
-      mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn
-      mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon
+    mkdir -p $out/share/themes
+    mv gtk3/rose-pine-gtk $out/share/themes/rose-pine
+    mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon
+    mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn
+    mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon
 
-      runHook postInstall
-    '';
+    runHook postInstall
+  '';
 
-    meta = with lib; {
-      description = "Rosé Pine theme for GTK";
-      homepage = "https://github.com/rose-pine/gtk";
-      license = licenses.gpl3Only;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [romildo the-argus];
-    };
-  }
+  meta = with lib; {
+    description = "Rosé Pine theme for GTK";
+    homepage = "https://github.com/rose-pine/gtk";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [romildo the-argus];
+  };
+}

From b92f2042a008218f614b4910dbaa9d700bd45da8 Mon Sep 17 00:00:00 2001
From: Ian McFarlane <i.mcfarlane2002@gmail.com>
Date: Sun, 22 Jan 2023 02:46:29 -0500
Subject: [PATCH 7/8] rose-pine-gtk: remove reference to nonexistent variable
 variant

---
 pkgs/data/themes/rose-pine-gtk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix
index 8398373756f8..707b05fd8e2a 100644
--- a/pkgs/data/themes/rose-pine-gtk/default.nix
+++ b/pkgs/data/themes/rose-pine-gtk/default.nix
@@ -7,7 +7,7 @@
   gtk_engines,
 }:
 stdenv.mkDerivation rec {
-  pname = "rose-pine-${variant}-gtk-theme";
+  pname = "rose-pine-gtk-theme";
   version = "unstable-2022-09-01";
 
   src = fetchFromGitHub {

From fc0c3f538258b2973f46b50098a99bcc14779843 Mon Sep 17 00:00:00 2001
From: Ian McFarlane <70479099+the-argus@users.noreply.github.com>
Date: Sun, 22 Jan 2023 21:12:09 +0000
Subject: [PATCH 8/8] rose-pine-gtk: use nixpkgs-fmt, NoCC, and update icon
 cache

---
 pkgs/data/icons/rose-pine/default.nix      | 19 ++++++++++++++-----
 pkgs/data/themes/rose-pine-gtk/default.nix | 16 ++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix
index 6ce6f1d59a33..051294c5d3a8 100644
--- a/pkgs/data/icons/rose-pine/default.nix
+++ b/pkgs/data/icons/rose-pine/default.nix
@@ -1,9 +1,10 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, gtk3
 }:
-stdenv.mkDerivation rec {
+
+stdenvNoCC.mkDerivation rec {
   pname = "rose-pine-icon-theme";
   version = "unstable-2022-09-01";
 
@@ -14,6 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
   };
 
+  nativeBuildInputs = [
+    gtk3
+  ];
+
   # avoid the makefile which is only for the theme maintainers
   dontBuild = true;
 
@@ -25,6 +30,10 @@ stdenv.mkDerivation rec {
     mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn
     mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon
 
+    for theme in $out/share/icons/*; do
+      gtk-update-icon-cache $theme
+    done
+
     runHook postInstall
   '';
 
diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix
index 707b05fd8e2a..4211864139df 100644
--- a/pkgs/data/themes/rose-pine-gtk/default.nix
+++ b/pkgs/data/themes/rose-pine-gtk/default.nix
@@ -1,12 +1,12 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  lib,
-  gnome-themes-extra,
-  gtk-engine-murrine,
-  gtk_engines,
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, gnome-themes-extra
+, gtk-engine-murrine
+, gtk_engines
 }:
-stdenv.mkDerivation rec {
+
+stdenvNoCC.mkDerivation rec {
   pname = "rose-pine-gtk-theme";
   version = "unstable-2022-09-01";