From: Alyssa Ross <alyssa.ross@unikie.com>
To: devel@spectrum-os.org
Cc: Puck Meerburg <puck@puckipedia.com>,
Ville Ilvonen <ville.ilvonen@unikie.com>,
sternenseemann <sternenseemann@systemli.org>
Subject: [RFC PATCH nixpkgs v2 9/9] wayland-proxy-virtwl: unstable-2021-12-05 -> unstable-2022-09-22
Date: Fri, 30 Sep 2022 21:12:45 +0000 [thread overview]
Message-ID: <20220930211245.1699375-1-alyssa.ross@unikie.com> (raw)
In-Reply-To: <20220930210906.1696349-1-alyssa.ross@unikie.com>
From: sternenseemann <sternenseemann@systemli.org>
Co-authored-by: Alyssa Ross <hi@alyssa.is>
(cherry picked from commit 5cac465ec618cdc6e9077b447b4a5b138e482ddb)
Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
---
.../wayland/wayland-proxy-virtwl/default.nix | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
index 8c7708c3e3d..3931fe9c3da 100644
--- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
+++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
@@ -1,17 +1,19 @@
{ lib
, fetchFromGitHub
, ocamlPackages
+, pkg-config
+, libdrm
}:
ocamlPackages.buildDunePackage rec {
pname = "wayland-proxy-virtwl";
- version = "unstable-2021-12-05";
+ version = "unstable-2022-09-22";
src = fetchFromGitHub {
owner = "talex5";
repo = pname;
- rev = "d7f58d405514dd031f2f12e402c8c6a58e62a885";
- sha256 = "0riwaqdlrx2gzkrb02v4zdl4ivpmz9g5w87lj3bhqs0l3s6c249s";
+ rev = "5940346db2a4427f21c7b30a2593b179af36a935";
+ sha256 = "0jnr5q52nb3yqr7ykvvb902xsad24cdi9imkslcsa5cnzb4095rw";
};
postPatch = ''
@@ -19,21 +21,22 @@ ocamlPackages.buildDunePackage rec {
rm -r ocaml-wayland
'';
- useDune2 = true;
- minimumOCamlVersion = "4.08";
+ minimalOCamlVersion = "4.12";
strictDeps = true;
nativeBuildInputs = [
ocamlPackages.ppx_cstruct
+ pkg-config
];
- buildInputs = with ocamlPackages; [
+ buildInputs = [ libdrm ] ++ (with ocamlPackages; [
+ dune-configurator
wayland
cmdliner
logs
cstruct-lwt
ppx_cstruct
- ];
+ ]);
doCheck = true;
--
2.37.1
prev parent reply other threads:[~2022-09-30 21:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 21:08 [RFC PATCH nixpkgs v2 0/9] virtio-gpu with crosvm and cloud-hypervisor Alyssa Ross
2022-09-30 21:08 ` [RFC PATCH nixpkgs v2 1/9] crosvm: switch back to old git repo URL Alyssa Ross
2022-09-30 21:08 ` [RFC PATCH nixpkgs v2 2/9] crosvm.updateScript: update release branch format Alyssa Ross
2022-09-30 21:09 ` [RFC PATCH nixpkgs v2 3/9] crosvm: 104.0 -> 106.2 Alyssa Ross
2022-09-30 21:09 ` [RFC PATCH nixpkgs v2 4/9] crosvm.updateScript: don't vendor Cargo.lock Alyssa Ross
2022-09-30 21:09 ` [RFC PATCH nixpkgs v2 5/9] crosvm: add fixes for cloud-hypervisor virtio-gpu Alyssa Ross
2022-09-30 21:09 ` [RFC PATCH nixpkgs v2 6/9] rustPlatform: forward unpack hooks to cargo fetch Alyssa Ross
2022-09-30 21:09 ` [RFC PATCH nixpkgs v2 7/9] cloud-hypervisor: add virtio-gpu support Alyssa Ross
2022-09-30 21:09 ` [RFC PATCH nixpkgs v2 8/9] ocamlPackages.wayland: 1.0 -> 1.1 Alyssa Ross
2022-09-30 21:12 ` Alyssa Ross [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220930211245.1699375-1-alyssa.ross@unikie.com \
--to=alyssa.ross@unikie.com \
--cc=devel@spectrum-os.org \
--cc=puck@puckipedia.com \
--cc=sternenseemann@systemli.org \
--cc=ville.ilvonen@unikie.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).