diff options
author | danbst <abcz2.uprola@gmail.com> | 2017-06-07 17:20:00 +0300 |
---|---|---|
committer | danbst <abcz2.uprola@gmail.com> | 2017-06-07 17:20:00 +0300 |
commit | 7179b0119981750d7b72b092587a16544774ac92 (patch) | |
tree | f324026274314812e0fa37e20069a6be526e20b4 /pkgs/applications | |
parent | e9da05ee8b6d6e470d54e38869710d316d9935c8 (diff) | |
download | nixlib-7179b0119981750d7b72b092587a16544774ac92.tar nixlib-7179b0119981750d7b72b092587a16544774ac92.tar.gz nixlib-7179b0119981750d7b72b092587a16544774ac92.tar.bz2 nixlib-7179b0119981750d7b72b092587a16544774ac92.tar.lz nixlib-7179b0119981750d7b72b092587a16544774ac92.tar.xz nixlib-7179b0119981750d7b72b092587a16544774ac92.tar.zst nixlib-7179b0119981750d7b72b092587a16544774ac92.zip |
zoom-us: little fixes after review by @k0001
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 45be8da8a97f..a1e94817b244 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, system, rsync, makeWrapper, +{ stdenv, fetchurl, system, makeWrapper, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation { src = srcs.${system}; - buildInputs = [ rsync makeWrapper ]; + buildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ alsaLib @@ -58,24 +58,25 @@ in stdenv.mkDerivation { installPhase = '' $preInstallHooks - mkdir -p $out/share + packagePath=$out/share/zoom-us + mkdir -p $packagePath mkdir -p $out/bin - rsync -av . $out/share/ + cp -ar * $packagePath patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/zoom + $packagePath/zoom # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53 # it works for me without it, but, well... - paxmark m $out/share/zoom - #paxmark m $out/share/QtWebEngineProcess # is this what dtzWill talked about? + paxmark m $packagePath/zoom + #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 - wrapProgram $out/share/zoom \ - --prefix LD_LIBRARY_PATH : "$out/share:$libPath" \ - --set QT_PLUGIN_PATH "$out/share/platforms" \ + wrapProgram $packagePath/zoom \ + --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ + --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --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 ''; |