Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-01-11 13:36:42 +01:00
6904 changed files with 17629 additions and 16627 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }:
{ lib, stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }:
stdenv.mkDerivation rec {
version = "1.3";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxcb xcbutil ];
checkInputs = [ libX11 ];
meta = with stdenv.lib; {
meta = with lib; {
description = "XCB utility functions for the X resource manager";
homepage = "https://github.com/Airblader/xcb-util-xrm";
license = licenses.mit; # X11 variant