Commit 5bbeebfd authored by Ilya Fedin's avatar Ilya Fedin
Browse files

telegram-desktop: actually support AVIF/HEIF/JXL on Darwin 

There's no sense to supply libraries to the wrapper, they should be unwrapped build inputs so that tdesktop builds the bundled kimageformats code using those libraries
parent 5f99f468

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix

+0 −8
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
  qtsvg,

  qtwayland,

  kimageformats,

  libavif,

  libheif,

  libjxl,

  wrapGAppsHook3,

  wrapQtAppsHook,

  geoclue2,
@@ -41,11 +38,6 @@ stdenv.mkDerivation (finalAttrs: { 
    kimageformats

    qtwayland

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    libavif

    libheif

    libjxl

  ]

  ++ lib.optionals withWebkit [

    glib-networking

  ];

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
  microsoft-gsl,

  boost,

  ada,

  libavif,

  libheif,

  libjxl,

  libicns,

  apple-sdk_15,

  nix-update-script,
@@ -90,6 +93,9 @@ stdenv.mkDerivation (finalAttrs: { 
  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    apple-sdk_15

    libicns

    libavif

    libheif

    libjxl

  ];



  dontWrapQtApps = true;