summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-05-07 02:29:25 +0200
committerRobin Gloster <mail@glob.in>2019-05-07 18:14:11 +0200
commitabb10fe7aed454e2fde6ab1bcb11107b736fd5d4 (patch)
treef9e9c2e2679321542960d77c30d846f5183cc72a
parentd8a74e9a0c85bf0f9a862084b8603b161fc6461e (diff)
downloadnixpkgs-abb10fe7aed454e2fde6ab1bcb11107b736fd5d4.tar
nixpkgs-abb10fe7aed454e2fde6ab1bcb11107b736fd5d4.tar.gz
nixpkgs-abb10fe7aed454e2fde6ab1bcb11107b736fd5d4.tar.bz2
nixpkgs-abb10fe7aed454e2fde6ab1bcb11107b736fd5d4.tar.lz
nixpkgs-abb10fe7aed454e2fde6ab1bcb11107b736fd5d4.tar.xz
nixpkgs-abb10fe7aed454e2fde6ab1bcb11107b736fd5d4.tar.zst
nixpkgs-abb10fe7aed454e2fde6ab1bcb11107b736fd5d4.zip
xorg.libXi: fix cross
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 068130f9c76..8a1eef6ac1d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -198,6 +198,9 @@ self: super:
   libXi = super.libXi.overrideAttrs (attrs: {
     outputs = [ "out" "dev" "man" "doc" ];
     propagatedBuildInputs = [ self.libXfixes ];
+    configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "xorg_cv_malloc0_returns_null=no"
+    ];
   });
 
   libXinerama = super.libXinerama.overrideAttrs (attrs: {