summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-03-03 23:08:24 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2020-04-06 16:36:27 -0400
commit24f8bad37cceed22fffb5908c69c7fa5c8596c92 (patch)
tree0b336bc6e92364eb1cfa7d7c93428713122bc323 /pkgs/servers/x11
parent7cc40e15e46033924d9d141b3869a94d9d31a973 (diff)
downloadnixpkgs-24f8bad37cceed22fffb5908c69c7fa5c8596c92.tar
nixpkgs-24f8bad37cceed22fffb5908c69c7fa5c8596c92.tar.gz
nixpkgs-24f8bad37cceed22fffb5908c69c7fa5c8596c92.tar.bz2
nixpkgs-24f8bad37cceed22fffb5908c69c7fa5c8596c92.tar.lz
nixpkgs-24f8bad37cceed22fffb5908c69c7fa5c8596c92.tar.xz
nixpkgs-24f8bad37cceed22fffb5908c69c7fa5c8596c92.tar.zst
nixpkgs-24f8bad37cceed22fffb5908c69c7fa5c8596c92.zip
libXres: enable cross-compilation
- adds utilmacros
- set null malloc flag
Diffstat (limited to 'pkgs/servers/x11')
-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 7a58210b051..fc3adf2c660 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -256,6 +256,9 @@ self: super:
 
   libXres = super.libXres.overrideAttrs (attrs: {
     outputs = [ "out" "dev" "devdoc" ];
+    buildInputs = with self; attrs.buildInputs ++ [ utilmacros ];
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
   });
 
   libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: {