Merge remote-tracking branch 'origin/master' into staging

2019-01-10 16:00:34 +01:00
parent 52a12dacf9 2f1e8d40cf
commit 237deba4e7
281 changed files with 16988 additions and 13353 deletions
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ libX11 libXi libXtst xorgproto ];
+  NIX_LDFLAGS = [
+    "-lX11"
+  ];

  meta = with stdenv.lib; {
    description = "X virtual keyboard library";