Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eb6df5f186ec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: edcc3e530c8d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 22, 2019

  1. xorg.luit: fix darwin build

    @LnL7
    LnL7 committed Jan 22, 2019
    Copy the full SHA
    8c0cc98 View commit details

Commits on Jan 28, 2019

  1. Merge pull request #54481 from LnL7/darwin-luit 

    xorg.luit: fix darwin build
    @LnL7
    LnL7 authored Jan 28, 2019
    Copy the full SHA
    edcc3e5 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 pkgs/servers/x11/xorg/overrides.nix
8 changes: 5 additions & 3 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -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: {