From 23e49b78e5a2904f4fa920ef07d81e58cf4ae339 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 4 Jan 2019 14:10:06 +0100 Subject: [PATCH] xorg.xorgproto: add legacy support This adds support for e.g. printproto needed for libXp Adapted from @MP2E's patch in #48549 --- pkgs/servers/x11/xorg/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 29a7e39cdd9..a3cc183bb3a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -2,7 +2,7 @@ stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - freetype, tradcpp, fontconfig, + freetype, tradcpp, fontconfig, meson, ninja, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, epoxy, openssl, pkgconfig, llvm_6, @@ -438,6 +438,9 @@ self: super: xorgproto = super.xorgproto.overrideAttrs (attrs: { buildInputs = []; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ]; + # adds support for printproto needed for libXp + mesonFlags = [ "-Dlegacy=true" ]; }); xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed: