Merge master into staging-next

2018-11-29 08:12:56 +01:00
parent 9caab8ff4a 8d88e4f6c7
commit 9db2421d1f
177 changed files with 4259 additions and 2087 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, popt }:
+{ stdenv, buildPackages, fetchFromGitHub, pkgconfig, popt }:

 stdenv.mkDerivation rec {
  name = "efivar-${version}";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {

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

  makeFlags = [
    "prefix=$(out)"