diff options
author | Thane Gill <me@thanegill.com> | 2018-10-24 02:42:04 -0700 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-24 11:42:04 +0200 |
commit | 81047fa45827180eefa821ee70c5ab28da67c233 (patch) | |
tree | a3163f4e01391fb1c1c8420a9e848e2ef4b6613d /pkgs | |
parent | 782c820ad93af54ede7adb110a6279d1bf1b7473 (diff) | |
download | nixlib-81047fa45827180eefa821ee70c5ab28da67c233.tar nixlib-81047fa45827180eefa821ee70c5ab28da67c233.tar.gz nixlib-81047fa45827180eefa821ee70c5ab28da67c233.tar.bz2 nixlib-81047fa45827180eefa821ee70c5ab28da67c233.tar.lz nixlib-81047fa45827180eefa821ee70c5ab28da67c233.tar.xz nixlib-81047fa45827180eefa821ee70c5ab28da67c233.tar.zst nixlib-81047fa45827180eefa821ee70c5ab28da67c233.zip |
Airtame 3.1.1 -> 3.3.0 (#48505)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/airtame/default.nix | 64 |
1 files changed, 22 insertions, 42 deletions
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 18f47b7652f8..3e5bf8df4a7b 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -6,51 +6,20 @@ }: let libPath = lib.makeLibraryPath [ - alsaLib - atk - cairo - cups - curl - dbus - expat - ffmpeg - fontconfig - freetype - gdk_pixbuf - glib - glibc - gnome2.GConf - gtk2 - libopus - nspr - nss - pango - stdenv.cc.cc - udev - x264 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libpulseaudio - libxcb + alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk_pixbuf + glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264 + libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXtst libpulseaudio libxcb ]; in stdenv.mkDerivation rec { pname = "airtame"; - version = "3.1.1"; + version = "3.3.0"; name = "${pname}-${version}"; longName = "${pname}-application"; src = fetchurl { url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz"; - sha256 = "1am1qz280r5g9i0vwwx5lr24fpdl5lazhpr2bhb34nlr5d8rsmzr"; + sha256 = "16ca1vcxpka26jcrfbxpq74kcizgrm138j94bby6kzqp2swhrl76"; }; nativeBuildInputs = [ makeWrapper ]; @@ -77,15 +46,26 @@ in stdenv.mkDerivation rec { ln -s "$opt/icon.png" "$out/share/icons/airtame.png" # Flags and rpath are copied from launch-airtame.sh. - interp="$(< $NIX_CC/nix-support/dynamic-linker)" - vendorlib="$opt/resources/app.asar.unpacked/streamer/vendor/airtame-core/lib" - rpath="${libPath}:$opt:$vendorlib:$opt/resources/app.asar.unpacked/encryption/out/lib" - rm $vendorlib/libcurl.so* + vendorlib="\ + $opt/resources/app.asar.unpacked/modules/streamer/dist/deps/airtame-modules:\ + $opt/resources/app.asar.unpacked/encryption/out/lib:\ + $opt/resources/deps/airtame-core/lib:\ + $opt/resources/deps/airtame-encryption/lib" + + echo $vendorlib + + rpath="${libPath}:$opt:$vendorlib" + find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \ -exec patchelf --set-rpath "$rpath" {} \; + # The main binary also needs libudev which was removed by --shrink-rpath. + interp="$(< $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter "$interp" $opt/${longName} - wrapProgram $opt/${longName} --add-flags "--disable-gpu --enable-transparent-visuals" + + wrapProgram $opt/${longName} \ + --prefix LD_LIBRARY_PATH=$rpath \ + --add-flags "--disable-gpu --enable-transparent-visuals" ''; dontPatchELF = true; |