cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #300443 from pokon548/custom-args-qq

Browse source 
qq: use makeShellWrapper instead to wrap program to support command line options
This commit is contained in:
Aleksana 2024-04-11 16:30:18 +08:00 committed by GitHub
commit 1dd6addcca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/instant-messengers/qq/default.nix
View file

@ -19,7 +19,8 @@
, vips , vips
, at-spi2-core , at-spi2-core
, autoPatchelfHook , autoPatchelfHook
, makeWrapper , makeShellWrapper
, wrapGAppsHook
}: }:
let let
@ -43,7 +44,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
makeWrapper makeShellWrapper
wrapGAppsHook
dpkg dpkg
]; ];
@ -62,6 +64,8 @@ stdenv.mkDerivation {
xorg.libXdamage xorg.libXdamage
]; ];
dontWrapGApps = true;
runtimeDependencies = map lib.getLib [ runtimeDependencies = map lib.getLib [
systemd systemd
]; ];
@ -75,9 +79,11 @@ stdenv.mkDerivation {
substituteInPlace $out/share/applications/qq.desktop \ substituteInPlace $out/share/applications/qq.desktop \
--replace "/opt/QQ/qq" "$out/bin/qq" \ --replace "/opt/QQ/qq" "$out/bin/qq" \
--replace "/usr/share" "$out/share" --replace "/usr/share" "$out/share"
makeWrapper $out/opt/QQ/qq $out/bin/qq \ makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
"''${gappsWrapperArgs[@]}"
# Remove bundled libraries # Remove bundled libraries
rm -r $out/opt/QQ/resources/app/sharp-lib rm -r $out/opt/QQ/resources/app/sharp-lib