Unverified Commit b6cd58e6 authored by Tawsif Hossain Shafi's avatar Tawsif Hossain Shafi Committed by GitHub
Browse files

waydroid-helper: fix dependencies and `WrapperArgs` issues (#412027) 



Co-authored-by: default avatarAleksana <alexander.huang.y@gmail.com>
Co-authored-by: default avatarShafa'el Zmeyev <shafael170@gmail.com>
parent 59f474b3

pkgs/by-name/wa/waydroid-helper/package.nix

+6 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  dbus,

  systemd,

  bash,

  fakeroot,

  gobject-introspection,

}:
@@ -41,8 +42,6 @@ python3Packages.buildPythonApplication rec { 
    # com.jaoushingan.WaydroidHelper.desktop: component-name-missing, description-first-para-too-short

    # url-homepage-missing, desktop-app-launchable-omitted, content-rating-missing, developer-info-missing

    sed -i '/test(/{N;/Validate appstream file/!b;:a;N;/)/!ba;d}' data/meson.build

    substituteInPlace waydroid_helper/waydroid-cli.in \

      --replace-fail "/bin/bash" "${bash}/bin/bash"

  '';



  nativeBuildInputs = [
@@ -61,6 +60,7 @@ python3Packages.buildPythonApplication rec { 
    libxml2

    libadwaita

    dbus

    bash

    systemd

  ];
@@ -78,7 +78,10 @@ python3Packages.buildPythonApplication rec { 


  dontWrapGApps = true;



  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];

  makeWrapperArgs = [

    "\${gappsWrapperArgs[@]}"

    "--prefix PATH : ${lib.makeBinPath [ fakeroot ]}"

  ];



  postInstallCheck = ''

    mesonCheckPhase