diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-18 06:01:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 06:01:28 +0100 |
| commit | cb2c96db15cb9d31003327a9a1ae5198fd888353 (patch) | |
| tree | 4dee7f197df32a12585a5237fbb67db53818b382 | |
| parent | ddf1381181e79e0ba76e031d13ce9397918d3af3 (diff) | |
| parent | e31cf313a940cca22a8489ccd0ae31f0180bb07c (diff) | |
| download | nixpkgs-cb2c96db15cb9d31003327a9a1ae5198fd888353.tar nixpkgs-cb2c96db15cb9d31003327a9a1ae5198fd888353.tar.gz nixpkgs-cb2c96db15cb9d31003327a9a1ae5198fd888353.tar.bz2 nixpkgs-cb2c96db15cb9d31003327a9a1ae5198fd888353.tar.lz nixpkgs-cb2c96db15cb9d31003327a9a1ae5198fd888353.tar.xz nixpkgs-cb2c96db15cb9d31003327a9a1ae5198fd888353.tar.zst nixpkgs-cb2c96db15cb9d31003327a9a1ae5198fd888353.zip | |
Merge pull request #267053 from ilya-fedin/kotato-fix-darwin
kotatogram-desktop: fix build on Darwin after #234359
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index b5879ffe5b4..694021d0f7f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ff1a43f586..b6e33201aeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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. |