diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-20 18:01:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-20 18:01:18 +0000 |
| commit | ba32b28e592c84809add67ff7494059e20978e07 (patch) | |
| tree | 596e9242978fab968fc73ad6e42c972b9caa8294 /pkgs/servers/x11 | |
| parent | cdc8393c04c072c0f480135b4c96a9b72c85d1be (diff) | |
| parent | 4be96dbda035972f60f9e0f386aaec2abd6f1cdb (diff) | |
| download | nixpkgs-ba32b28e592c84809add67ff7494059e20978e07.tar nixpkgs-ba32b28e592c84809add67ff7494059e20978e07.tar.gz nixpkgs-ba32b28e592c84809add67ff7494059e20978e07.tar.bz2 nixpkgs-ba32b28e592c84809add67ff7494059e20978e07.tar.lz nixpkgs-ba32b28e592c84809add67ff7494059e20978e07.tar.xz nixpkgs-ba32b28e592c84809add67ff7494059e20978e07.tar.zst nixpkgs-ba32b28e592c84809add67ff7494059e20978e07.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9b119aa7101..3a6ec31ad75 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -779,6 +779,7 @@ self: super: stdenv = if isDarwin then clangStdenv else stdenv; }).overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds; + depsBuildBuild = [ buildPackages.stdenv.cc ]; configureFlags = [ "--with-xserver=${self.xorgserver.out}/bin/X" ] ++ lib.optionals isDarwin [ @@ -794,6 +795,10 @@ self: super: sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7"; }) ]; + postPatch = '' + # Avoid replacement of word-looking cpp's builtin macros in Nix's cross-compiled paths + substituteInPlace Makefile.in --replace "PROGCPPDEFS =" "PROGCPPDEFS = -Dlinux=linux -Dunix=unix" + ''; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ] ++ lib.optionals isDarwin [ self.libX11 self.xorgproto ]; postFixup = '' |