From 7890ae52484042279a7414d7e9bd9f80ef9274a4 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Sun, 30 Apr 2023 22:41:24 -0400
Subject: [PATCH] Add sommelier fork package

---
 flake.nix                            |  1 +
 home-manager/linux/programs/sway.nix |  2 ++
 packages/sommelier/default.nix       | 29 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 packages/sommelier/default.nix

diff --git a/flake.nix b/flake.nix
index 858068b..5c619f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -249,6 +249,7 @@
           };
           swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
           layman = pkgs.callPackage ./packages/layman/default.nix { };
+          sommelier = pkgs.callPackage ./packages/sommelier/default.nix { };
         };
       });
 }
diff --git a/home-manager/linux/programs/sway.nix b/home-manager/linux/programs/sway.nix
index 7e786fb..a28c3e3 100644
--- a/home-manager/linux/programs/sway.nix
+++ b/home-manager/linux/programs/sway.nix
@@ -50,6 +50,8 @@ in with lib; {
       font-awesome
       layman-package
       inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.wob
+      # For fancy x11 scaling
+      inputs.self.packages.${pkgs.system}.sommelier
     ];
     #########################
     ## Sway
diff --git a/packages/sommelier/default.nix b/packages/sommelier/default.nix
new file mode 100644
index 0000000..3f19ac0
--- /dev/null
+++ b/packages/sommelier/default.nix
@@ -0,0 +1,29 @@
+  { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
+  , libxkbcommon, mesa, pixman, xorg, wayland, gtest }:
+
+  stdenv.mkDerivation {
+    pname = "sommelier";
+    version = "104.0";
+
+    src = fetchFromGitHub {
+      owner = "niklashhh";
+      repo = "sommelier";
+      rev = "a39700971b63284dd4c3e1400be8d753db08119e";
+      sha256 = "sha256-Xa39QyUuSzw7+rm9va8aj9iHo3d1LqoQxmAAPJ/slqQ=";
+    };
+
+    nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
+    buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ];
+
+    doCheck = true;
+    nativeCheckInputs = [ gtest ];
+
+    meta = with lib; {
+      homepage =
+        "https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/main/vm_tools/sommelier/";
+      description = "Nested Wayland compositor with support for X11 forwarding";
+      maintainers = with maintainers; [ qyliss ];
+      license = licenses.bsd3;
+      platforms = platforms.linux;
+    };
+  }