ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #272244 from LostAttractor/qq

Browse Source 
qq: bump version, fix the missing of `libEGL.so.1` and some other improvements
This commit is contained in:
Weijia Wang 2023-12-07 10:44:09 +01:00 committed by GitHub
commit 109cce4155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
, cups
, dpkg
, fetchurl
, gjs
, glib
, gtk3
, lib
@ -11,6 +10,7 @@
, libgcrypt
, libkrb5
, mesa # for libgbm
, libGL
, nss
, xorg
, systemd
@ -19,7 +19,6 @@
, at-spi2-core
, autoPatchelfHook
, wrapGAppsHook
, makeWrapper
}:
let
@ -43,8 +42,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
# makeBinaryWrapper not support shell wrapper specifically for `NIXOS_OZONE_WL`.
(wrapGAppsHook.override { inherit makeWrapper; })
wrapGAppsHook
dpkg
];
@ -76,7 +74,9 @@ stdenv.mkDerivation {
substituteInPlace $out/share/applications/qq.desktop \
--replace "/opt/QQ/qq" "$out/bin/qq" \
--replace "/usr/share" "$out/share"
ln -s $out/opt/QQ/qq $out/bin/qq
makeWrapper $out/opt/QQ/qq $out/bin/qq \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
# Remove bundled libraries
rm -r $out/opt/QQ/resources/app/sharp-lib
@ -91,13 +91,6 @@ stdenv.mkDerivation {
runHook postInstall
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ gjs ]}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
)
'';
passthru.updateScript = ./update.sh;
meta = with lib; {

10
pkgs/applications/networking/instant-messengers/qq/sources.nix
View File

@ -1,8 +1,8 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2023-11-14
# Last updated: 2023-12-05
{
version = "3.2.2-18394";
urlhash = "fd2e886e";
arm64_hash = "sha256-6E3h7Z4936YKZb+G0FoMb90T3EzH8z07mmGMnL4SDFk=";
amd64_hash = "sha256-L1M8O0FzVKLXNNYGGMPf1Nbh/DFxLHBlbzapr7uz5Sk=";
version = "3.2.3-19189";
urlhash = "06d558c3";
arm64_hash = "sha256-qNcw6P985F/JAB9roxaBR5hz2KcLiffUDKu/14nvvgE=";
amd64_hash = "sha256-37d7F1VB2puEFJC12x57aRj4NIYcCYyPCK06Z/OwNiM=";
}