nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-26 14:53:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #69700: libX11: upstream patch to fix cross-compilation

Browse Source 
... into staging
This commit is contained in:
Vladimír Čunát 2019-09-28 09:25:26 +02:00
commit 52af1d0930
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
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: {
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 ];