(update): dwl, vm config

3 files changed, 58 insertions, 3 deletions

diff --git a/packages/dwl.nix b/packages/dwl.nix
index 28f3cdd..5a9e9dd 100644
--- a/packages/dwl.nix
+++ b/packages/dwl.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "compromyse";
     repo = "dwl";
     rev = "compromyse";
-    hash = "sha256-PP9abXvvnfig9rErtMLI50DwydLKng6XuOhXbYys2EY=";
+    hash = "sha256-nyMxMuhtk/VczZmheknnFitbKZwYeBV3G7xyVFPzi4M=";
   };
 
   nativeBuildInputs = [
diff --git a/packages/wayland-protocols.nix b/packages/wayland-protocols.nix
new file mode 100644
index 0000000..76976be
--- /dev/null
+++ b/packages/wayland-protocols.nix
@@ -0,0 +1,55 @@
+{ lib, stdenv, fetchurl
+, pkg-config
+, meson, ninja, wayland-scanner
+, python3, wayland
+, gitUpdater, testers
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wayland-protocols";
+  version = "1.38";
+
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform &&
+  # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
+  stdenv.hostPlatform.linker == "bfd" && lib.meta.availableOn stdenv.hostPlatform wayland;
+
+  src = fetchurl {
+    url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/xcpLAUVnSsgzmys/kLX4xooGY+hQpp2mwOvfDhYHb4=";
+  };
+
+  postPatch = lib.optionalString finalAttrs.doCheck ''
+    patchShebangs tests/
+  '';
+
+  depsBuildBuild = [ pkg-config ];
+  nativeBuildInputs = [ meson ninja wayland-scanner ];
+  nativeCheckInputs = [ python3 ];
+  checkInputs = [ wayland ];
+
+  mesonFlags = [ "-Dtests=${lib.boolToString finalAttrs.doCheck}" ];
+
+  meta = {
+    description = "Wayland protocol extensions";
+    longDescription = ''
+      wayland-protocols contains Wayland protocols that add functionality not
+      available in the Wayland core protocol. Such protocols either add
+      completely new functionality, or extend the functionality of some other
+      protocol either in Wayland core, or some other protocol in
+      wayland-protocols.
+    '';
+    homepage    = "https://gitlab.freedesktop.org/wayland/wayland-protocols";
+    license     = lib.licenses.mit; # Expat version
+    platforms   = lib.platforms.all;
+    maintainers = with lib.maintainers; [ primeos ];
+    pkgConfigModules = [ "wayland-protocols" ];
+  };
+
+  passthru.updateScript = gitUpdater {
+    url = "https://gitlab.freedesktop.org/wayland/wayland-protocols.git";
+  };
+  passthru.version = finalAttrs.version;
+  passthru.tests.pkg-config = testers.hasPkgConfigModules {
+    package = finalAttrs.finalPackage;
+  };
+})
diff --git a/packages/wlroots.nix b/packages/wlroots.nix
index 6d8a2b3..c632018 100644
--- a/packages/wlroots.nix
+++ b/packages/wlroots.nix
@@ -15,8 +15,8 @@ let
     repo = "wlroots";
     repo_git = "https://${domain}/${owner}/${repo}";
     branch = "master";
-    rev = "47fb00f66d5a8367d0108bd960f99e51ab1a1318";
-    sha256 = "sha256-HkpTML14tbYBLiHkqoFRSn/qKsVny/oso2TuG6LY/fk=";
+    rev = "d835fa813f82501eb668708af33afc42010707cf";
+    sha256 = "sha256-YXLa0fjqND7Gys4KK/CZmRqGU70gMVqU3T+j+e6S9qw=";
   };
   ignore = [
     "wlroots"