diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-28 09:25:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-28 09:25:26 +0200 |
| commit | 52af1d0930732142937b8db6c28b7fcd16770a7c (patch) | |
| tree | 4fc7e311c36ccecc00897ab167f5bd0c36e456f9 | |
| parent | 2a284a7805096baf77f042e3e8d101aed1222fda (diff) | |
| parent | 85f97f2d01982cc53f9b4e73cfd59557a53e23ad (diff) | |
| download | nixpkgs-52af1d0930732142937b8db6c28b7fcd16770a7c.tar nixpkgs-52af1d0930732142937b8db6c28b7fcd16770a7c.tar.gz nixpkgs-52af1d0930732142937b8db6c28b7fcd16770a7c.tar.bz2 nixpkgs-52af1d0930732142937b8db6c28b7fcd16770a7c.tar.lz nixpkgs-52af1d0930732142937b8db6c28b7fcd16770a7c.tar.xz nixpkgs-52af1d0930732142937b8db6c28b7fcd16770a7c.tar.zst nixpkgs-52af1d0930732142937b8db6c28b7fcd16770a7c.zip | |
Merge #69700: libX11: upstream patch to fix cross-compilation
... into staging
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 7e081b664b3..4dc96ddd91b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -79,6 +79,13 @@ self: super: libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; + patches = [ + # Fixes an issue that happens when cross-compiling for us. + (fetchpatch { + url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac"; + sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza"; + }) + ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; depsBuildBuild = [ buildPackages.stdenv.cc ]; |