Unverified Commit cb2c96db authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #267053 from ilya-fedin/kotato-fix-darwin 

kotatogram-desktop: fix build on Darwin after #234359
parents ddf13811 e31cf313

pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix

+4 −4
Original line number Diff line number Diff line
@@ -82,15 +82,15 @@ stdenv.mkDerivation { 
    })

  ];



  postPatch = lib.optionalString stdenv.isLinux ''

  postPatch = ''

    rm -r src/third_party/libsrtp

    cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp

  '' + lib.optionalString stdenv.isLinux ''

    substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \

      --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \

      --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \

      --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \

      --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"'



    rm -r src/third_party/libsrtp

    cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp

  '';



  outputs = [ "out" "dev" ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -33103,7 +33103,7 @@ with pkgs; 
      CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit;















    stdenv = if stdenv.isDarwin













      then darwin.apple_sdk_11_0.stdenv













      then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_12.stdenv















      else stdenv;





























    # telegram-desktop has random crashes when jemalloc is built with gcc.