diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index 82764af64f53..7dfb46ce63cf 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -12,15 +12,15 @@ buildDunePackage rec { pname = "wayland"; - version = "0.2"; + version = "1.0"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { - url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-v${version}.tbz"; - sha256 = "4eb323e42a8c64e9e49b15a588342bfcc1e99640305cb261d128c75612d9458c"; + url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; + sha256 = "bf8fd0057242d11f1c265c11cfa5de3c517ec0ad5994eae45e1efe3aac034510"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 8673200172e4..4008461cc15f 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -1,17 +1,18 @@ { lib , fetchFromGitHub , ocamlPackages +, buildPackages }: ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2021-04-15"; + version = "unstable-2021-12-05"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "09321a28f3d4c0fa7e41ebb3014106b62090b649"; - sha256 = "03rc2jp5d2y9y7mfis6kk9gchd49gvq0jg6fq5gi9r21ckb4k5v4"; + rev = "d7f58d405514dd031f2f12e402c8c6a58e62a885"; + sha256 = "0riwaqdlrx2gzkrb02v4zdl4ivpmz9g5w87lj3bhqs0l3s6c249s"; }; postPatch = '' @@ -22,12 +23,19 @@ ocamlPackages.buildDunePackage rec { useDune2 = true; minimumOCamlVersion = "4.08"; + nativeBuildInputs = [ + buildPackages.ocamlPackages.ppx_cstruct + ]; + buildInputs = with ocamlPackages; [ wayland cmdliner logs + cstruct-lwt ]; + doCheck = true; + meta = { homepage = "https://github.com/talex5/wayland-virtwl-proxy"; description = "Proxy Wayland connections across a VM boundary";