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

zoom-us: little fixes after review by @k0001

Browse Source
This commit is contained in:
danbst 2017-06-07 17:20:00 +03:00
parent e9da05ee8b
commit 7179b01199
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, system, rsync, 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 }:
@ -17,7 +17,7 @@ in stdenv.mkDerivation {
src = srcs.${system}; src = srcs.${system};
buildInputs = [ rsync makeWrapper ]; buildInputs = [ makeWrapper ];
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
alsaLib alsaLib
@ -58,24 +58,25 @@ in stdenv.mkDerivation {
installPhase = '' installPhase = ''
$preInstallHooks $preInstallHooks
mkdir -p $out/share packagePath=$out/share/zoom-us
mkdir -p $packagePath
mkdir -p $out/bin mkdir -p $out/bin
rsync -av . $out/share/ cp -ar * $packagePath
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/share/zoom $packagePath/zoom
# 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 $out/share/zoom paxmark m $packagePath/zoom
#paxmark m $out/share/QtWebEngineProcess # is this what dtzWill talked about? #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about?
# 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 $out/share/zoom \ wrapProgram $packagePath/zoom \
--prefix LD_LIBRARY_PATH : "$out/share:$libPath" \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
--set QT_PLUGIN_PATH "$out/share/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 "$out/share/zoom" "$out/bin/zoom" ln -s "$packagePath/zoom" "$out/bin/zoom-us"
$postInstallHooks $postInstallHooks
''; '';