summary refs log tree commit diff
path: root/pkgs/applications/video/obs-studio
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2020-01-25 16:09:04 -0500
committerGitHub <noreply@github.com>2020-01-25 16:09:04 -0500
commitab94e9a83a76870ec340bfec3e2abad5ae45af13 (patch)
tree63599c89d286755f07f45e6c34e9c425745c8416 /pkgs/applications/video/obs-studio
parentea87d5fc8ade9e102032fd4dc04e9ae220c51415 (diff)
parentf0baa13bec31fa129f0fd06183bf46de6f9e0f67 (diff)
downloadnixpkgs-ab94e9a83a76870ec340bfec3e2abad5ae45af13.tar
nixpkgs-ab94e9a83a76870ec340bfec3e2abad5ae45af13.tar.gz
nixpkgs-ab94e9a83a76870ec340bfec3e2abad5ae45af13.tar.bz2
nixpkgs-ab94e9a83a76870ec340bfec3e2abad5ae45af13.tar.lz
nixpkgs-ab94e9a83a76870ec340bfec3e2abad5ae45af13.tar.xz
nixpkgs-ab94e9a83a76870ec340bfec3e2abad5ae45af13.tar.zst
nixpkgs-ab94e9a83a76870ec340bfec3e2abad5ae45af13.zip
Merge pull request #77565 from NilsIrl/wlrobs_2020
obs-wlrobs: 20191008 -> 20200111
Diffstat (limited to 'pkgs/applications/video/obs-studio')
-rw-r--r--pkgs/applications/video/obs-studio/wlrobs.nix23
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix
index 13a53f94590..05b826c9cef 100644
--- a/pkgs/applications/video/obs-studio/wlrobs.nix
+++ b/pkgs/applications/video/obs-studio/wlrobs.nix
@@ -5,28 +5,33 @@
 # nix-env -f . -iA obs-wlrobs
 # mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit
 # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit
-{ stdenv, fetchhg, wayland, obs-studio }:
+{ stdenv, fetchhg, wayland, obs-studio
+, meson, ninja, pkgconfig, libX11
+, dmabufSupport ? false, libdrm ? null, libGL ? null}:
+
+assert dmabufSupport -> libdrm != null && libGL != null;
+
 stdenv.mkDerivation {
   pname = "obs-wlrobs";
-  version = "20191008";
+  version = "20200111";
 
   src = fetchhg {
     url = "https://hg.sr.ht/~scoopta/wlrobs";
-    rev = "82e2b93c6f662dfd9d69f7826c0096bef585c3ae";
-    sha256 = "1d2mlybkwyr0jw6paamazla2a1cyj60bs10i0lk9jclxnp780fy6";
+    rev = "8345bf985e390896d89e35e2feae1fa37722f4be";
+    sha256 = "0j01wkhwhhla4qx8mwyrq2qj9cfhxksxaq2k8rskmy2qbdkvvdpb";
   };
 
-  buildInputs = [ wayland obs-studio ];
-
-  preBuild = ''
-    cd Release
-  '';
+  buildInputs = [ libX11 libGL libdrm meson ninja pkgconfig wayland obs-studio ];
 
   installPhase = ''
     mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit
     cp ./libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit/
   '';
 
+  mesonFlags = [
+    "-Duse_dmabuf=${if dmabufSupport then "true" else "false"}"
+  ];
+
   meta = with stdenv.lib; {
     description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors";
     homepage = https://hg.sr.ht/~scoopta/wlrobs;