From 8c0cc98600b1be6162e3063996db87733a4ccfb4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 22 Jan 2019 21:44:23 +0100
Subject: [PATCH] xorg.luit: fix darwin build
---
pkgs/servers/x11/xorg/overrides.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 27fc33e764bf..bd529c178f4f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,7 +1,7 @@
{ abiCompat ? null,
stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages,
- automake, autoconf, libtool, intltool, mtdev, libevdev, libinput,
+ automake, autoconf, libiconv, libtool, intltool, mtdev, libevdev, libinput,
freetype, tradcpp, fontconfig, meson, ninja,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
@@ -143,10 +143,12 @@ self: super:
outputs = [ "out" "dev" "devdoc" ];
});
- # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
- # Once the bug is fixed upstream, this can be removed.
luit = super.luit.overrideAttrs (attrs: {
+ # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
+ # Once the bug is fixed upstream, this can be removed.
configureFlags = [ "--disable-selective-werror" ];
+
+ buildInputs = attrs.buildInputs ++ [libiconv];
});
libICE = super.libICE.overrideAttrs (attrs: {