From 05245fc0ea7a7af15bed9544c4c2f4d639a80ef2 Mon Sep 17 00:00:00 2001
From: ash <ash@sorrel.sh>
Date: Thu, 10 Aug 2023 18:40:42 +0100
Subject: [PATCH 1/3] nixos/picom: add `package` option

---
 nixos/modules/services/x11/picom.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index 1d6f3daa4022..01db5a7cd4d4 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -61,6 +61,8 @@ in {
       '';
     };
 
+    package = mkPackageOption pkgs "picom" { };
+
     fade = mkOption {
       type = types.bool;
       default = false;
@@ -301,13 +303,13 @@ in {
       };
 
       serviceConfig = {
-        ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}";
+        ExecStart = "${cfg.package}/bin/picom --config ${configFile}";
         RestartSec = 3;
         Restart = "always";
       };
     };
 
-    environment.systemPackages = [ pkgs.picom ];
+    environment.systemPackages = [ cfg.package ];
   };
 
   meta.maintainers = with lib.maintainers; [ rnhmjoj ];

From 94a30928952ce432a058cb40b305ed5cb16d973f Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Mon, 14 Aug 2023 11:18:06 +0300
Subject: [PATCH 2/3] nixos/picom: mkPackageOption -> mkPackageOptionMD

---
 nixos/modules/services/x11/picom.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index 01db5a7cd4d4..91463724c072 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -61,7 +61,7 @@ in {
       '';
     };
 
-    package = mkPackageOption pkgs "picom" { };
+    package = mkPackageOptionMD pkgs "picom" { };
 
     fade = mkOption {
       type = types.bool;

From e0fad0515b7821648183363f4efb616adfafc429 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Mon, 14 Aug 2023 11:19:41 +0300
Subject: [PATCH 3/3] nixos/picom: use lib.getExe

Co-authored-by: Jian Lin <75130626+jian-lin@users.noreply.github.com>
---
 nixos/modules/services/x11/picom.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index 91463724c072..3df0ea9e60bb 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -303,7 +303,7 @@ in {
       };
 
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/picom --config ${configFile}";
+        ExecStart = "${getExe cfg.package} --config ${configFile}";
         RestartSec = 3;
         Restart = "always";
       };