diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-01-28 21:19:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 21:19:02 +0100 |
| commit | edcc3e530c8d4d86be28ea33e66819a3be05d57d (patch) | |
| tree | 1b41f857221c622db4bed3df27a958f63de5e9e5 /pkgs/servers | |
| parent | eb6df5f186ecb161f14f6775bc159541bd8380c2 (diff) | |
| parent | 8c0cc98600b1be6162e3063996db87733a4ccfb4 (diff) | |
| download | nixlib-edcc3e530c8d4d86be28ea33e66819a3be05d57d.tar nixlib-edcc3e530c8d4d86be28ea33e66819a3be05d57d.tar.gz nixlib-edcc3e530c8d4d86be28ea33e66819a3be05d57d.tar.bz2 nixlib-edcc3e530c8d4d86be28ea33e66819a3be05d57d.tar.lz nixlib-edcc3e530c8d4d86be28ea33e66819a3be05d57d.tar.xz nixlib-edcc3e530c8d4d86be28ea33e66819a3be05d57d.tar.zst nixlib-edcc3e530c8d4d86be28ea33e66819a3be05d57d.zip | |
Merge pull request #54481 from LnL7/darwin-luit
xorg.luit: fix darwin build
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files 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: { |