Merge pull request #133631 from WolfangAukang/upwork-5.6.7.13

upwork: 5.5.0.11 -> 5.6.7.13
This commit is contained in:
Artturi 2021-08-12 21:14:16 +03:00 committed by GitHub
commit 6dfd25fdc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook { lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook
, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: , libXScrnSaver, libXtst, mesa, nspr, nss, pango, systemd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "upwork"; pname = "upwork";
version = "5.5.0.11"; version = "5.6.7.13";
src = fetchurl { src = fetchurl {
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_11_61df9c99b6df4e7b/${pname}_${version}_amd64.deb"; url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_7_13_9f0e0a44a59e4331/${pname}_${version}_amd64.deb";
sha256 = "db83d5fb1b5383992c6156284f6f3cd3a6b23f727ce324ba90c82817553fb4f7"; sha256 = "f1d3168cda47f77100192ee97aa629e2452fe62fb364dd59ad361adbc0d1da87";
}; };
dontWrapGApps = true; dontWrapGApps = true;
@ -23,10 +23,10 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libcxx systemd libpulseaudio libcxx systemd libpulseaudio
stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libdrm libnotify
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libuuid libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
libXtst nspr nss libxcb pango systemd libXScrnSaver libXi libXrandr libXrender libXScrnSaver libXtst mesa nspr nss pango systemd
]; ];
libPath = lib.makeLibraryPath buildInputs; libPath = lib.makeLibraryPath buildInputs;
@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
mv usr $out mv usr $out
mv opt $out mv opt $out
sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop
makeWrapper $out/opt/Upwork/upwork \ makeWrapper $out/opt/Upwork/upwork \
$out/bin/upwork \ $out/bin/upwork \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \