webkitgtk: remove reference to private Apple SDK
This commit is contained in:
parent
2457ddc952
commit
44b130d392
|
@ -36,7 +36,7 @@
|
||||||
, libidn
|
, libidn
|
||||||
, libedit
|
, libedit
|
||||||
, readline
|
, readline
|
||||||
, sdk
|
, apple_sdk
|
||||||
, libGL
|
, libGL
|
||||||
, libGLU
|
, libGLU
|
||||||
, mesa
|
, mesa
|
||||||
|
@ -167,13 +167,15 @@ stdenv.mkDerivation rec {
|
||||||
]) ++ lib.optionals stdenv.isDarwin [
|
]) ++ lib.optionals stdenv.isDarwin [
|
||||||
libedit
|
libedit
|
||||||
readline
|
readline
|
||||||
|
] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) (
|
||||||
# Pull a header that contains a definition of proc_pid_rusage().
|
# 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
|
# (We pick just that one because using the other headers from `sdk` is not
|
||||||
# compatible with our C++ standard library)
|
# compatible with our C++ standard library. This header is already in
|
||||||
(runCommandNoCC "${pname}_headers" {} ''
|
# the standard library on aarch64)
|
||||||
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
|
runCommandNoCC "${pname}_headers" {} ''
|
||||||
'')
|
install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
''
|
||||||
|
) ++ lib.optionals stdenv.isLinux [
|
||||||
bubblewrap
|
bubblewrap
|
||||||
libseccomp
|
libseccomp
|
||||||
systemd
|
systemd
|
||||||
|
|
|
@ -19079,7 +19079,7 @@ with pkgs;
|
||||||
webkitgtk = callPackage ../development/libraries/webkitgtk {
|
webkitgtk = callPackage ../development/libraries/webkitgtk {
|
||||||
harfbuzz = harfbuzzFull;
|
harfbuzz = harfbuzzFull;
|
||||||
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
|
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
|
||||||
inherit (darwin.apple_sdk) sdk;
|
inherit (darwin) apple_sdk;
|
||||||
};
|
};
|
||||||
|
|
||||||
websocketpp = callPackage ../development/libraries/websocket++ { };
|
websocketpp = callPackage ../development/libraries/websocket++ { };
|
||||||
|
|
Loading…
Reference in a new issue