diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index df80cfbc9126..d5e64c146571 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -3,6 +3,8 @@ { lib, stdenv, + meson, + ninja, pkg-config, xorg-server, dri-pkgconfig-stub, @@ -18,6 +20,7 @@ libxkbfile, libxshmfence, mesa-gl-headers, + mesa, openssl, pixman, libxcb-util, @@ -29,6 +32,7 @@ xkeyboard-config, xorgproto, xtrans, + font-util, }: stdenv.mkDerivation (finalAttrs: { pname = "xvfb"; @@ -37,11 +41,14 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; buildInputs = [ - dri-pkgconfig-stub - libdrm + font-util libGL libx11 libxau @@ -62,18 +69,37 @@ stdenv.mkDerivation (finalAttrs: { libxcb-wm xorgproto xtrans + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + dri-pkgconfig-stub + libdrm + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + mesa ]; - configureFlags = [ - "--enable-xvfb" - "--disable-xorg" - "--disable-xquartz" - "--disable-xwayland" - "--with-xkb-bin-directory=${xkbcomp}/bin" - "--with-xkb-path=${xkeyboard-config}/share/X11/xkb" - "--with-xkb-output=$out/share/X11/xkb/compiled" + mesonFlags = [ + "-Dxvfb=true" + "-Dxephyr=false" + "-Dxorg=false" + "-Dxnest=false" + "-Dsecure-rpc=false" + "-Dudev=false" + "-Dudev_kms=false" + + "-Dlog_dir=/var/log" + "-Ddefault_font_path=" + + "-Dxkb_bin_dir=${xkbcomp}/bin" + "-Dxkb_dir=${xkeyboard-config}/share/X11/xkb" + "-Dxkb_output_dir=$out/share/X11/xkb/compiled" ] - ++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace"; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "-Dxcsecurity=true" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-Ddtrace=false" + ]; meta = { description = "X virtual framebuffer";