public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libX11: adds upstream patch to fix cross-compilation

Browse Source 
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
This commit is contained in:
Samuel Dionne-Riel 2019-09-27 17:10:04 -04:00
parent c0cba22090
commit 85f97f2d01
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/servers/x11/xorg/overrides.nix
View File

@ -79,6 +79,13 @@ self: super:
libX11 = super.libX11.overrideAttrs (attrs: { libX11 = super.libX11.overrideAttrs (attrs: {
outputs = [ "out" "dev" "man" ]; 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 [] configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag; ++ malloc0ReturnsNullCrossFlag;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];