From 21d09bcb717de1f618f47a4d23989a5f5617575a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 May 2016 18:17:28 +0200 Subject: [PATCH] efivar: fix build after #15449 I don't know why it matters here; the error was: linux.c:25:24: fatal error: linux/nvme.h: No such file or directory --- pkgs/tools/system/efivar/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index b4da2044f69..4cfdf861b2b 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, popt }: +{ stdenv, fetchFromGitHub, pkgconfig, popt, linuxHeaders }: stdenv.mkDerivation rec { name = "efivar-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt ]; + buildInputs = [ popt linuxHeaders ]; postPatch = '' substituteInPlace src/Makefile --replace "-static" "" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45df8ecfcfa..2a8b856a492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1398,7 +1398,9 @@ in efibootmgr = callPackage ../tools/system/efibootmgr { }; - efivar = callPackage ../tools/system/efivar { }; + efivar = callPackage ../tools/system/efivar { + linuxHeaders = linuxHeaders_3_18; + }; evemu = callPackage ../tools/system/evemu { };