diff options
| author | Robin Gloster <mail@glob.in> | 2019-01-04 14:10:06 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | 23e49b78e5a2904f4fa920ef07d81e58cf4ae339 (patch) | |
| tree | e8a5e1d7d2dc22f512abee0bb842d64400ae45e1 /pkgs/servers | |
| parent | fca792353f44b57f2a55bddf2d63385792a7649b (diff) | |
| download | nixpkgs-23e49b78e5a2904f4fa920ef07d81e58cf4ae339.tar nixpkgs-23e49b78e5a2904f4fa920ef07d81e58cf4ae339.tar.gz nixpkgs-23e49b78e5a2904f4fa920ef07d81e58cf4ae339.tar.bz2 nixpkgs-23e49b78e5a2904f4fa920ef07d81e58cf4ae339.tar.lz nixpkgs-23e49b78e5a2904f4fa920ef07d81e58cf4ae339.tar.xz nixpkgs-23e49b78e5a2904f4fa920ef07d81e58cf4ae339.tar.zst nixpkgs-23e49b78e5a2904f4fa920ef07d81e58cf4ae339.zip | |
xorg.xorgproto: add legacy support
This adds support for e.g. printproto needed for libXp Adapted from @MP2E's patch in #48549
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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: |