Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7ec975fa84ad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 21597ed69e6d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 8, 2019

  1. obs-wlrobs: init at 20191008

    @grahamc
    grahamc committed Oct 8, 2019
    Copy the full SHA
    a763975 View commit details

  2. Merge pull request #70750 from grahamc/wlrobs 

    obs-wlrobs: init at 20191008
    @grahamc
    grahamc authored Oct 8, 2019
    Copy the full SHA
    21597ed View commit details
Showing with 39 additions and 0 deletions.
  1. +37 −0 pkgs/applications/video/obs-studio/wlrobs.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
37 changes: 37 additions & 0 deletions pkgs/applications/video/obs-studio/wlrobs.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# (the following is somewhat lifted from ./linuxbrowser.nix)
# We don't have a wrapper which can supply obs-studio plugins so you have to
# somewhat manually install this:

# 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.mkDerivation {
pname = "obs-wlrobs";
version = "20191008";

src = fetchhg {
url = "https://hg.sr.ht/~scoopta/wlrobs";
rev = "82e2b93c6f662dfd9d69f7826c0096bef585c3ae";
sha256 = "1d2mlybkwyr0jw6paamazla2a1cyj60bs10i0lk9jclxnp780fy6";
};

buildInputs = [ wayland obs-studio ];

preBuild = ''
cd Release
'';

installPhase = ''
mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit
cp ./libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit/
'';

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;
maintainers = with maintainers; [ grahamc ];
license = licenses.gpl3;
platforms = [ "x86_64-linux" ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -19929,6 +19929,8 @@ in

obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };

obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { };

octoprint = callPackage ../applications/misc/octoprint { };

octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { };