From c8f1f64a8d5bb0f090fb551757088f1ee39fdbf1 Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Thu, 30 Jun 2022 19:06:21 -0700 Subject: [PATCH 1/2] maintainers: add billhuang --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c253f4b3f78..ed767154977 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1615,6 +1615,12 @@ githubId = 13324165; name = "Bill Ewanick"; }; + billhuang = { + email = "bill.huang2001@gmail.com"; + github = "BillHuang2001"; + githubId = 11801831; + name = "Bill Huang"; + }; binarin = { email = "binarin@binarin.ru"; github = "binarin"; From 816079d8857c9ca69969b0c0b8388c274962f3b3 Mon Sep 17 00:00:00 2001 From: Bill Huang Date: Thu, 30 Jun 2022 19:28:09 -0700 Subject: [PATCH 2/2] feishu: init at 5.9.18 delete trailing whitespaces simplify code move to nativeBuildInputs --- .../instant-messengers/feishu/default.nix | 173 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 175 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/feishu/default.nix diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix new file mode 100644 index 00000000000..4dfd048b1b8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -0,0 +1,173 @@ +{ alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, dpkg +, expat +, fetchurl +, fontconfig +, freetype +, gdk-pixbuf +, glib +, glibc +, gnutls +, gtk3 +, lib +, libGL +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libappindicator-gtk3 +, libcxx +, libdbusmenu +, libdrm +, libgcrypt +, libglvnd +, libnotify +, libuuid +, libxcb +, libxkbcommon +, libxkbfile +, libxshmfence +, makeShellWrapper +, mesa +, nspr +, nss +, pango +, pciutils +, pipewire +, pixman +, stdenv +, systemd +, wayland +, wrapGAppsHook +, xdg-utils +}: + +stdenv.mkDerivation rec { + version = "5.9.18"; + pname = "feishu"; + packageHash = "5db94058d7ad"; # A hash value used in the download url + + src = fetchurl { + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb"; + sha256 = "ffb29b5a184b025d4e4ea468a8f684a7067ab5bfd45867abc370e59be63892c7"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeShellWrapper + dpkg + ]; + + buildInputs = [ + gtk3 + + # for autopatchelf + alsa-lib + cups + libXdamage + libdrm + libxshmfence + mesa + nspr + nss + ]; + + rpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + glibc + gnutls + libGL + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator-gtk3 + libcxx + libdbusmenu + libdrm + libgcrypt + libglvnd + libnotify + libuuid + libxcb + libxkbcommon + libxkbfile + libxshmfence + mesa + nspr + nss + pango + pciutils + pipewire + pixman + stdenv.cc.cc + systemd + wayland + xdg-utils + ]; + + dontUnpack = true; + installPhase = '' + # This deb file contains a setuid binary, + # so 'dpkg -x' doesn't work here. + dpkg --fsys-tarfile $src | tar --extract + mkdir -p $out + mv usr/share $out/ + mv opt/ $out/ + chmod -R g-w $out + + substituteInPlace $out/share/applications/bytedance-feishu.desktop \ + --replace /usr/bin/bytedance-feishu-stable $out/opt/bytedance/feishu/bytedance-feishu + + wrapProgram $out/opt/bytedance/feishu/feishu \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu + + mkdir -p $out/share/icons/hicolor + base="$out/opt/bytedance/feishu" + for size in 16 24 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps + ln -s $base/product_logo_$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/bytedance-feishu.png + done + ''; + + meta = with lib; { + description = "An all-in-one collaboration suite"; + homepage = "https://www.feishu.cn/en/"; + downloadPage = "https://www.feishu.cn/en/#en_home_download_block"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 785f97d9bc0..f30c104dd59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26862,6 +26862,8 @@ with pkgs; feh = callPackage ../applications/graphics/feh { }; + feishu = callPackage ../applications/networking/instant-messengers/feishu {}; + filezilla = callPackage ../applications/networking/ftp/filezilla { }; buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) {};