JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
kotatogram-desktop: fix build on Darwin after #234359
This commit is contained in:
Weijia Wang 2023-11-18 06:01:28 +01:00 committed by GitHub
commit cb2c96db15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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" ];

2
pkgs/top-level/all-packages.nix
View File

@ -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.