From 0a8d1627ec7dfb3cdf8a87201d5ac55beab023bc Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 15 May 2016 19:30:39 +0200
Subject: [PATCH] Revert "efivar: fix build after #15449"

This reverts commit 21d09bcb717de1f618f47a4d23989a5f5617575a.
---
 pkgs/tools/system/efivar/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix      | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 4cfdf861b2b..b4da2044f69 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, popt, linuxHeaders }:
+{ stdenv, fetchFromGitHub, pkgconfig, popt }:
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ popt linuxHeaders ];
+  buildInputs = [ popt ];
 
   postPatch = ''
      substituteInPlace src/Makefile --replace "-static" ""
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a8b856a492..45df8ecfcfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1398,9 +1398,7 @@ in
 
   efibootmgr = callPackage ../tools/system/efibootmgr { };
 
-  efivar = callPackage ../tools/system/efivar {
-    linuxHeaders = linuxHeaders_3_18;
-  };
+  efivar = callPackage ../tools/system/efivar { };
 
   evemu = callPackage ../tools/system/evemu { };