alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

webkitgtk: remove reference to private Apple SDK

Browse source
This commit is contained in:
Angus Trau 2021-07-31 21:36:43 +10:00 committed by Raphael Megzari
parent 2457ddc952
commit 44b130d392
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/libraries/webkitgtk/default.nix
View file

@ -36,7 +36,7 @@
, libidn
, libedit
, readline
, sdk
, apple_sdk
, libGL
, libGLU
, mesa
@ -167,13 +167,15 @@ stdenv.mkDerivation rec {
]) ++ lib.optionals stdenv.isDarwin [
libedit
readline
] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) (
# Pull a header that contains a definition of proc_pid_rusage().
# (We pick just that one because using the other headers from `sdk` is not
# compatible with our C++ standard library)
(runCommandNoCC "${pname}_headers" {} ''
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
'')
] ++ lib.optionals stdenv.isLinux [
# compatible with our C++ standard library. This header is already in
# the standard library on aarch64)
runCommandNoCC "${pname}_headers" {} ''
install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
''
) ++ lib.optionals stdenv.isLinux [
bubblewrap
libseccomp
systemd

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

@ -19079,7 +19079,7 @@ with pkgs;
webkitgtk = callPackage ../development/libraries/webkitgtk {
harfbuzz = harfbuzzFull;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
inherit (darwin.apple_sdk) sdk;
inherit (darwin) apple_sdk;
};
websocketpp = callPackage ../development/libraries/websocket++ { };