From f680a4a25c040efe36509f84a840bb326c12be19 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 24 Mar 2024 07:43:37 +0000
Subject: [PATCH] engrampa: patch the package via sane.programs, not nixpkgs
 overlay

---
 hosts/common/programs/assorted.nix | 13 -------------
 hosts/common/programs/default.nix  |  1 +
 hosts/common/programs/engrampa.nix | 26 ++++++++++++++++++++++++++
 pkgs/default.nix                   |  2 --
 pkgs/patched/engrampa/default.nix  | 15 ---------------
 5 files changed, 27 insertions(+), 30 deletions(-)
 create mode 100644 hosts/common/programs/engrampa.nix
 delete mode 100644 pkgs/patched/engrampa/default.nix

diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix
index 1eb13ed3..f3b88d8e 100644
--- a/hosts/common/programs/assorted.nix
+++ b/hosts/common/programs/assorted.nix
@@ -612,19 +612,6 @@ in
 
     lua = {};
 
-    "mate.engrampa".packageUnwrapped = pkgs.rmDbusServices pkgs.mate.engrampa;
-    "mate.engrampa".sandbox.method = "bwrap";  # TODO:sandbox: untested
-    "mate.engrampa".sandbox.whitelistWayland = true;
-    "mate.engrampa".sandbox.autodetectCliPaths = "existingOrParent";
-    "mate.engrampa".sandbox.extraHomePaths = [
-      "archive"
-      "Books/local"
-      "Books/servo"
-      "records"
-      "ref"
-      "tmp"
-    ];
-
     mercurial.sandbox.method = "bwrap";  # TODO:sandbox: untested
     mercurial.sandbox.net = "clearnet";
     mercurial.sandbox.whitelistPwd = true;
diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix
index c28332b1..3e8120f9 100644
--- a/hosts/common/programs/default.nix
+++ b/hosts/common/programs/default.nix
@@ -27,6 +27,7 @@
     ./dino.nix
     ./dissent.nix
     ./element-desktop.nix
+    ./engrampa.nix
     ./epiphany.nix
     ./evince.nix
     ./fcitx5.nix
diff --git a/hosts/common/programs/engrampa.nix b/hosts/common/programs/engrampa.nix
new file mode 100644
index 00000000..b11eaba4
--- /dev/null
+++ b/hosts/common/programs/engrampa.nix
@@ -0,0 +1,26 @@
+{ lib, pkgs, ... }:
+{
+  sane.programs."mate.engrampa" = {
+    packageUnwrapped = pkgs.rmDbusServices (pkgs.mate.engrampa.overrideAttrs (upstream: {
+      src = lib.warnIf (upstream.version != "1.26.1") "engrampa package pin is outdated" (pkgs.fetchFromGitHub {
+        owner = "mate-desktop";
+        repo = "engrampa";
+        # point to a version > 1.27.0, for working cross compilation.
+        # remove this override once engrampa > 1.27.0 is released.
+        rev = "45f52c13baa93857d912effb4f1f9a58c41a0da3";
+        hash = "sha256-j7tASMjBSA+d1a9Fu3G/328aRDqNJjXoITxogRH0YI4=";
+      });
+    }));
+    sandbox.method = "bwrap";  # TODO:sandbox: untested
+    sandbox.whitelistWayland = true;
+    sandbox.autodetectCliPaths = "existingOrParent";
+    sandbox.extraHomePaths = [
+      "archive"
+      "Books/local"
+      "Books/servo"
+      "records"
+      "ref"
+      "tmp"
+    ];
+  };
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 269b1ff3..658b872c 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -118,8 +118,6 @@ let
 
     browserpass = callPackage ./patched/browserpass { inherit (unpatched) browserpass; };
 
-    engrampa = callPackage ./patched/engrampa { inherit (unpatched) mate; };
-
     # mozilla keeps nerfing itself and removing configuration options
     firefox-unwrapped = callPackage ./patched/firefox-unwrapped { inherit (unpatched) firefox-unwrapped; };
 
diff --git a/pkgs/patched/engrampa/default.nix b/pkgs/patched/engrampa/default.nix
deleted file mode 100644
index f7a19a00..00000000
--- a/pkgs/patched/engrampa/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ mate
-, fetchFromGitHub
-, lib
-}:
-mate.engrampa.overrideAttrs (super: {
-  pname = "engrampa-sane";
-  src = lib.warnIf (super.version != "1.26.1") "engrampa package pin is outdated" (fetchFromGitHub {
-    owner = "mate-desktop";
-    repo = "engrampa";
-    # point to a version > 1.27.0, for working cross compilation.
-    # remove this override once engrampa > 1.27.0 is released.
-    rev = "45f52c13baa93857d912effb4f1f9a58c41a0da3";
-    hash = "sha256-j7tASMjBSA+d1a9Fu3G/328aRDqNJjXoITxogRH0YI4=";
-  });
-})