diff options
| author | Julien Moutinho <julm+nixpkgs@sourcephile.fr> | 2021-10-16 21:25:13 +0200 |
|---|---|---|
| committer | Julien Moutinho <julm+nixpkgs@sourcephile.fr> | 2021-10-20 18:33:17 +0200 |
| commit | 6e46232ca25c044691a2b423a2e96c4b385d9ac5 (patch) | |
| tree | dbec8710eeb13b35a8e4fa41253bc74f06c94109 /pkgs/servers/x11 | |
| parent | f1220d72a3a06b0fbac1999b5c8a097d1d10cc0f (diff) | |
| download | nixpkgs-6e46232ca25c044691a2b423a2e96c4b385d9ac5.tar nixpkgs-6e46232ca25c044691a2b423a2e96c4b385d9ac5.tar.gz nixpkgs-6e46232ca25c044691a2b423a2e96c4b385d9ac5.tar.bz2 nixpkgs-6e46232ca25c044691a2b423a2e96c4b385d9ac5.tar.lz nixpkgs-6e46232ca25c044691a2b423a2e96c4b385d9ac5.tar.xz nixpkgs-6e46232ca25c044691a2b423a2e96c4b385d9ac5.tar.zst nixpkgs-6e46232ca25c044691a2b423a2e96c4b385d9ac5.zip | |
xorg.xinit: fix cross-compiling
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 = '' |