diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-13 16:48:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 16:48:38 -0400 |
| commit | e520d6af29158ff6d17c34ec16b1f2e79bccad45 (patch) | |
| tree | ddf031dda697cba7549ed8357ca3454c30433fbd /pkgs/servers/x11 | |
| parent | 940c35568bc2fa135eafe0817027c765d9840469 (diff) | |
| parent | c6ff360cc437d366c10f2f827edd5a7fb47e73c3 (diff) | |
| download | nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.gz nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.bz2 nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.lz nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.xz nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.zst nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.zip | |
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e398b9b5d652..c6fe55ad9f75 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -256,6 +256,15 @@ 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: { + buildInputs = with self; attrs.buildInputs ++ [ utilmacros ]; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; }); libXv = super.libXv.overrideAttrs (attrs: { |