Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

obs-wlrobs: 20191008 -> 20200111 #77565

Merged
merged 1 commit into from Jan 25, 2020
Merged

obs-wlrobs: 20191008 -> 20200111 #77565

merged 1 commit into from Jan 25, 2020

Conversation

@NilsIrl
Copy link
Contributor

@NilsIrl NilsIrl commented Jan 12, 2020

Motivation for this change

Update

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @grahamc


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"}"

This comment has been minimized.

@grahamc

grahamc Jan 25, 2020
Member

What does this do, and why do we default it to off?

This comment has been minimized.

@NilsIrl

NilsIrl Jan 25, 2020
Author Contributor

It's a new back-end (that is supposed to have better performance). It doesn't support all the features (such as resizing and moving on obs) and it isn't enabled by default by meson so I disabled it.

@NilsIrl
Copy link
Contributor Author

@NilsIrl NilsIrl commented Jan 25, 2020

X11 had to be set as a dependency otherwise meson gives the following error:

Run-time dependency libobs found: NO

meson.build:5:0: ERROR: Could not generate cargs for libobs:
Package x11 was not found in the pkg-config search path.
Perhaps you should add the directory containing `x11.pc'
to the PKG_CONFIG_PATH environment variable
Package 'x11', required by 'libobs', not found

There's probably a better way of doing it (that I don't know of).

@grahamc
Copy link
Member

@grahamc grahamc commented Jan 25, 2020

Thank you for the ping!

@grahamc grahamc merged commit ab94e9a into NixOS:master Jan 25, 2020
15 checks passed
15 checks passed
obs-wlrobs on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
obs-wlrobs on x86_64-linux Success
Details
@NilsIrl NilsIrl deleted the NilsIrl:wlrobs_2020 branch Jan 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.