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

Merge pull request #160979 from a-m-joseph/webkitgtk-honor-dbusSupport

Browse Source
This commit is contained in:
Artturi 2022-03-08 20:53:13 +02:00 committed by GitHub
commit 582a78596e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -60,6 +60,7 @@
, addOpenGLRunpath , addOpenGLRunpath
, enableGeoLocation ? true , enableGeoLocation ? true
, withLibsecret ? true , withLibsecret ? true
, systemdSupport ? stdenv.isLinux
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -158,9 +159,10 @@ stdenv.mkDerivation rec {
bubblewrap bubblewrap
libseccomp libseccomp
libmanette libmanette
systemd
wayland wayland
xdg-dbus-proxy xdg-dbus-proxy
] ++ lib.optionals systemdSupport [
systemd
] ++ lib.optionals enableGeoLocation [ ] ++ lib.optionals enableGeoLocation [
geoclue2 geoclue2
] ++ lib.optionals withLibsecret [ ] ++ lib.optionals withLibsecret [
@ -193,7 +195,7 @@ stdenv.mkDerivation rec {
"-DUSE_APPLE_ICU=OFF" "-DUSE_APPLE_ICU=OFF"
"-DUSE_OPENGL_OR_ES=OFF" "-DUSE_OPENGL_OR_ES=OFF"
"-DUSE_SYSTEM_MALLOC=ON" "-DUSE_SYSTEM_MALLOC=ON"
] ++ lib.optionals (!stdenv.isLinux) [ ] ++ lib.optionals (!systemdSupport) [
"-DUSE_SYSTEMD=OFF" "-DUSE_SYSTEMD=OFF"
] ++ lib.optionals (stdenv.isLinux && enableGLES) [ ] ++ lib.optionals (stdenv.isLinux && enableGLES) [
"-DENABLE_GLES2=ON" "-DENABLE_GLES2=ON"