diff options
| author | ChaosAttractor <lostattractor@gmail.com> | 2023-12-05 20:40:29 +0800 |
|---|---|---|
| committer | ChaosAttractor <lostattractor@gmail.com> | 2023-12-06 15:49:37 +0800 |
| commit | 4abe534795daece815600969c867fd9521099329 (patch) | |
| tree | cb61491072f5f67bfab0815d2ea70253c77716b8 /pkgs/applications/networking/instant-messengers/qq | |
| parent | ee6873bdbb902ce9ccd8dfb6a43baaa8eacb910f (diff) | |
qq: use makewrapper instead of setting gappsWrapperArgs
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/qq')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/qq/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index af5cf167a62c9..b372d708eb754 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -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 PATH : "${lib.makeBinPath [ gjs ]}" \ + --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; { |