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: cfec14e1fe13
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c09536ef10e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 3, 2019

  1. zoom-us: set LD_PRELOAD=.../v4l2convert.so 

    This was needed for my webcam to work with zoom-us. v4l2convert is a
wrapper for apps that only support simple bgr24 or yuv420. For these
apps to support webcams that don’t use those formats, we need to use
LD_PRELOAD to get those symbols. Taken from archlinux wiki:

https://wiki.archlinux.org/index.php/Webcam_setup#V4L1_support
    @matthewbauer
    matthewbauer committed Jun 3, 2019
    Copy the full SHA
    9d65bb5 View commit details

  2. Merge pull request #62622 from matthewbauer/zoom-us-ld-preload 

    zoom-us: set LD_PRELOAD=.../v4l2convert.so
    @matthewbauer
    matthewbauer authored Jun 3, 2019
    Copy the full SHA
    8c09536 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
3 changes: 2 additions & 1 deletion pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
, qttools, qtwayland, qtwebchannel, qtwebengine
# Runtime
, coreutils, libjpeg_turbo, pciutils, procps, utillinux
, coreutils, libjpeg_turbo, pciutils, procps, utillinux, libv4l
, pulseaudioSupport ? true, libpulseaudio ? null
}:

@@ -72,6 +72,7 @@ in stdenv.mkDerivation {
makeWrapper $packagePath/zoom $out/bin/zoom-us \
--prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \
--prefix LD_PRELOAD : "${libv4l}/lib/libv4l/v4l2convert.so" \
--run "cd $packagePath"
runHook postInstall