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: 36d6bbaa70b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e3357a1b5aa7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 15, 2019

  1. xorg.xload: fix build (#57665) 

    add missing dependency gettext
    @xeji
    xeji authored Mar 15, 2019
    Copy the full SHA
    e3357a1 View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/servers/x11/xorg/overrides.nix
7 changes: 5 additions & 2 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ abiCompat ? null,
stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages,

automake, autoconf, libiconv, libtool, intltool, mtdev, libevdev, libinput,
automake, autoconf, gettext, 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,
@@ -442,6 +441,10 @@ self: super:
'';
});

xload = super.xload.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ gettext ];
});

xlsfonts = super.xlsfonts.overrideAttrs (attrs: {
meta = attrs.meta // { license = lib.licenses.mit; };
});