Merge remote-tracking branch 'upstream/master' into HEAD

2021-01-17 18:08:59 +01:00
parent 9541eb734d d87e126913
commit 1279bf812c
303 changed files with 1084 additions and 964 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }:
+{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkg-config, popt }:

 stdenv.mkDerivation rec {
  pname = "efivar";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
  postPatch = "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults";
  NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation";

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ popt ];
  depsBuildBuild = [ buildPackages.stdenv.cc ];