Remove custom sommelier package

This commit is contained in:
Nathan McCarty 2023-05-14 18:56:23 -04:00
parent ab2ae28c47
commit ef6b72db81
Signed by: thatonelutenist
SSH Key Fingerprint: SHA256:hwQEcmak9E6sdU9bXc98RHw/Xd1AhpB5HZT7ZSVJkRM
3 changed files with 1 additions and 41 deletions

View File

@ -249,7 +249,6 @@
}; };
swayimg = pkgs.callPackage ./packages/swayimg/default.nix { }; swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
layman = pkgs.callPackage ./packages/layman/default.nix { }; layman = pkgs.callPackage ./packages/layman/default.nix { };
sommelier = pkgs.callPackage ./packages/sommelier/default.nix { };
}; };
}); });
} }

View File

@ -15,17 +15,7 @@
}; };
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [ gammastep fido2luks ];
gammastep
fido2luks
(pkgs.makeDesktopItem rec {
name = "VMWare Workstation (Wrapped)";
exec = "${
inputs.self.packages.${pkgs.system}.sommelier
}/bin/sommelier -X --scale 1 vmware";
desktopName = name;
})
];
# Sway outputs # Sway outputs
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {

View File

@ -1,29 +0,0 @@
{ 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 = "akvadrako";
repo = "sommelier";
rev = "31a42a2f8c649ae82a3239284bced7ef39a569ef";
sha256 = "sha256-ZTvH4mn7eK2e/1u6FVVpR7aaeAQ+JxSa4nhXWLxSfvo=";
};
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;
};
}