diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-09-27 17:10:04 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-09-27 21:06:21 -0400 |
| commit | 85f97f2d01982cc53f9b4e73cfd59557a53e23ad (patch) | |
| tree | c4f14c6622676d2366883981b6296c025d4309e5 /pkgs/servers/x11 | |
| parent | c0cba22090c6fda2d47458cfa9a5a61e3aafcfef (diff) | |
| download | nixlib-85f97f2d01982cc53f9b4e73cfd59557a53e23ad.tar nixlib-85f97f2d01982cc53f9b4e73cfd59557a53e23ad.tar.gz nixlib-85f97f2d01982cc53f9b4e73cfd59557a53e23ad.tar.bz2 nixlib-85f97f2d01982cc53f9b4e73cfd59557a53e23ad.tar.lz nixlib-85f97f2d01982cc53f9b4e73cfd59557a53e23ad.tar.xz nixlib-85f97f2d01982cc53f9b4e73cfd59557a53e23ad.tar.zst nixlib-85f97f2d01982cc53f9b4e73cfd59557a53e23ad.zip | |
libX11: adds upstream patch to fix cross-compilation
With this patch applied, cross-compilation of a system image for ARM platforms works as it did previously. See their commit for more explanation: * https://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=0327c427d62f671eced067c6d9b69f4e216a8cac
Diffstat (limited to 'pkgs/servers/x11')
| -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 7e081b664b33..4dc96ddd91b6 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 ]; |