public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zoom-us-fix' of git://github.com/danbst/nixpkgs

Browse Source
This commit is contained in:
Shea Levy 2017-06-15 10:10:25 -04:00
commit 9101fe8f6c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, system, makeWrapper, { stdenv, fetchurl, system, makeWrapper,
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg }: libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
let let
@ -35,6 +35,8 @@ in stdenv.mkDerivation {
sqlite sqlite
utillinux utillinux
zlib zlib
udev
expat
xorg.libX11 xorg.libX11
xorg.libSM xorg.libSM
@ -51,6 +53,7 @@ in stdenv.mkDerivation {
xorg.libXi xorg.libXi
xorg.libXrender xorg.libXrender
xorg.libXcomposite xorg.libXcomposite
xorg.libXScrnSaver
stdenv.cc.cc stdenv.cc.cc
]; ];
@ -63,8 +66,10 @@ in stdenv.mkDerivation {
mkdir -p $out/bin mkdir -p $out/bin
cp -ar * $packagePath cp -ar * $packagePath
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zoom
$packagePath/zoom patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/QtWebEngineProcess
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/qtdiag
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $packagePath/zopen
# included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53 # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
# it works for me without it, but, well... # it works for me without it, but, well...
paxmark m $packagePath/zoom paxmark m $packagePath/zoom
@ -73,11 +78,17 @@ in stdenv.mkDerivation {
# RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it
wrapProgram $packagePath/zoom \ wrapProgram $packagePath/zoom \
--prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
--prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \
--set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \
--set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
--set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
ln -s "$packagePath/zoom" "$out/bin/zoom-us" ln -s "$packagePath/zoom" "$out/bin/zoom-us"
cat > $packagePath/qt.conf <<EOF
[Paths]
Prefix = $packagePath
EOF
$postInstallHooks $postInstallHooks
''; '';