Commit fdb1dfbf authored by TomaSajt's avatar TomaSajt Committed by github-actions[bot]
Browse files

cinny-desktop: make more dependencies optional, don't double wrap binary 

(cherry picked from commit bdefe3b4)
parent 34a4af73

pkgs/by-name/ci/cinny-desktop/package.nix

+15 −20
Original line number Diff line number Diff line
@@ -7,11 +7,8 @@ 
  cinny,

  desktop-file-utils,

  wrapGAppsHook3,

  makeBinaryWrapper,

  pkg-config,

  openssl,

  dbus,

  glib,

  glib-networking,

  webkitgtk_4_0,

  jq,
@@ -64,28 +61,26 @@ rustPlatform.buildRustPackage rec { 
        --set-key="Categories" --set-value="Network;InstantMessaging;" \

        $out/share/applications/cinny.desktop

    '';

  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''

    wrapProgram "$out/bin/cinny" \

      --inherit-argv0 \



  preFixup = ''

    gappsWrapperArgs+=(

      --set-default WEBKIT_DISABLE_DMABUF_RENDERER "1"

    )

  '';



  nativeBuildInputs = [

    wrapGAppsHook3

    pkg-config

  nativeBuildInputs =

    [

      cargo-tauri_1.hook

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      desktop-file-utils

    makeBinaryWrapper

      pkg-config

      wrapGAppsHook3

    ];



  buildInputs =

    [

      openssl

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [

      dbus

      glib

  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

    glib-networking

    openssl

    webkitgtk_4_0

  ];