public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "efivar: fix build after #15449"

Browse Source 
This reverts commit 21d09bcb71.
This commit is contained in:
Joachim Fasting
2016-05-15 19:30:39 +02:00
parent 21d09bcb71
commit 0a8d1627ec
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/efivar/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, popt, linuxHeaders }: { stdenv, fetchFromGitHub, pkgconfig, popt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efivar-${version}"; name = "efivar-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ popt linuxHeaders ]; buildInputs = [ popt ];
postPatch = '' postPatch = ''
substituteInPlace src/Makefile --replace "-static" "" substituteInPlace src/Makefile --replace "-static" ""
pkgs/top-level/all-packages.nix
+1 -3
View File
@@ -1398,9 +1398,7 @@ in
efibootmgr = callPackage ../tools/system/efibootmgr { }; efibootmgr = callPackage ../tools/system/efibootmgr { };
efivar = callPackage ../tools/system/efivar { efivar = callPackage ../tools/system/efivar { };
linuxHeaders = linuxHeaders_3_18;
};
evemu = callPackage ../tools/system/evemu { }; evemu = callPackage ../tools/system/evemu { };