From 384428756dcaf2ec2f378e74907aa8b1d5ed1e14 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 10 Jul 2023 06:49:27 +0000
Subject: [PATCH] tangram/epiphany: preserve desktop files when patching

---
 hosts/common/programs/epiphany.nix | 12 +++++++-----
 hosts/common/programs/tangram.nix  | 10 +++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/hosts/common/programs/epiphany.nix b/hosts/common/programs/epiphany.nix
index 5bc33321..4e834936 100644
--- a/hosts/common/programs/epiphany.nix
+++ b/hosts/common/programs/epiphany.nix
@@ -19,11 +19,13 @@
     # - <https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1164>
     # - <https://github.com/flatpak/flatpak/issues/3477>
     # - <https://github.com/NixOS/nixpkgs/issues/197085>
-    #
-    # N.B.: this mode of patching the package means no .desktop file!
-    package = pkgs.writeShellScriptBin "epiphany" ''
-      WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 ${pkgs.epiphany}/bin/epiphany
-    '';
+    package = pkgs.epiphany.overrideAttrs (upstream: {
+      preFixup = ''
+        gappsWrapperArgs+=(
+          --set WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS "1"
+        );
+      '' + (upstream.preFixup or "");
+    });
     persist.private = [
       ".cache/epiphany"
       ".local/share/epiphany"
diff --git a/hosts/common/programs/tangram.nix b/hosts/common/programs/tangram.nix
index 31a576a5..0de2667b 100644
--- a/hosts/common/programs/tangram.nix
+++ b/hosts/common/programs/tangram.nix
@@ -8,9 +8,13 @@
     # XXX(2023/07/08): running on moby without this hack fails, with:
     # - `bwrap: Can't make symlink at /var/run: File exists`
     # see epiphany.nix for more info
-    package = pkgs.writeShellScriptBin "re.sonny.Tangram" ''
-      WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 ${pkgs.tangram}/bin/re.sonny.Tangram
-    '';
+    package = pkgs.tangram.overrideAttrs (upstream: {
+      preFixup = ''
+        gappsWrapperArgs+=(
+          --set WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS "1"
+        );
+      '' + (upstream.preFixup or "");
+    });
     persist.private = [
       ".cache/Tangram"
       ".local/share/Tangram"