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

Merge pull request #232409 from SamLukeYes/qq

Browse Source 
qq: 3.1.1-11223 -> 3.1.2-12912
This commit is contained in:
Nick Cao 2023-05-21 03:39:46 -06:00 committed by GitHub
commit 7294100927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/instant-messengers/qq/default.nix
View File

@ -6,7 +6,7 @@
, glib , glib
, gtk3 , gtk3
, lib , lib
, libappindicator , libayatana-appindicator
, libdrm , libdrm
, libgcrypt , libgcrypt
, libkrb5 , libkrb5
@ -22,15 +22,16 @@
}: }:
let let
version = "3.1.1-11223"; version = "3.1.2-12912";
_hash = "80d33f88";
srcs = { srcs = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_amd64.deb"; url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_amd64.deb";
sha256 = "sha256-TBgQ7zV+juB3KSgIIXuvxnYmvnnM/1/wU0EkiopIqvY="; hash = "sha256-F+zIHqYWKiCHYNJZ5hRw0rzltizjuqhVxbpzQGagoZ0=";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_arm64.deb"; url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_arm64.deb";
sha256 = "sha256-1ba/IA/+X/s7jUtIhh3OsBHU7MPggGrASsBPx8euBBs="; hash = "sha256-5n4T0mlfEh9/84wUYiH437R95Qz6/SKDq/AK6baiW24=";
}; };
}; };
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@ -39,8 +40,6 @@ stdenv.mkDerivation {
pname = "qq"; pname = "qq";
inherit version src; inherit version src;
unpackCmd = "dpkg-deb -x $curSrc source";
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
wrapGAppsHook wrapGAppsHook
@ -63,7 +62,6 @@ stdenv.mkDerivation {
]; ];
runtimeDependencies = map lib.getLib [ runtimeDependencies = map lib.getLib [
libappindicator
systemd systemd
]; ];
@ -81,6 +79,10 @@ stdenv.mkDerivation {
# Remove bundled libraries # Remove bundled libraries
rm -r $out/opt/QQ/resources/app/sharp-lib rm -r $out/opt/QQ/resources/app/sharp-lib
# https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e
ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \
$out/opt/QQ/libappindicator3.so
runHook postInstall runHook postInstall
''; '';