diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2021-03-16 23:13:09 +0900 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-03-20 11:32:32 -0400 |
| commit | a5979a4f99f4317236ba11cb646a0f3da1a1896d (patch) | |
| tree | 3dd2145ea2affb957876aabb272df52b44f4cb27 /pkgs/development/libraries/qt-5 | |
| parent | 5268bf50d2cc91709ee1c8f6d75eacd7ce492df1 (diff) | |
| download | nixpkgs-a5979a4f99f4317236ba11cb646a0f3da1a1896d.tar nixpkgs-a5979a4f99f4317236ba11cb646a0f3da1a1896d.tar.gz nixpkgs-a5979a4f99f4317236ba11cb646a0f3da1a1896d.tar.bz2 nixpkgs-a5979a4f99f4317236ba11cb646a0f3da1a1896d.tar.lz nixpkgs-a5979a4f99f4317236ba11cb646a0f3da1a1896d.tar.xz nixpkgs-a5979a4f99f4317236ba11cb646a0f3da1a1896d.tar.zst nixpkgs-a5979a4f99f4317236ba11cb646a0f3da1a1896d.zip | |
qtwebengine: switch to pure sandbox on darwin
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 9613eed2874..617b2c1d9d2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -90,11 +90,7 @@ qtModule { '' else '' substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - '') - + '' - substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \ - --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' - ''); + '')); NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit @@ -190,6 +186,7 @@ qtModule { buildInputs = optionals stdenv.isDarwin (with darwin; [ cups + apple_sdk.libs.sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` # to get some information about the host platform. @@ -205,15 +202,8 @@ qtModule { shift done '') - - # For sandbox.h include - (runCommand "MacOS_SDK_sandbox.h" {} '' - install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h - '') ]); - __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib"; - dontUseNinjaBuild = true; dontUseNinjaInstall = true; dontUseXcbuild = true; |