From 15b07f4b8e23ef40b9bc84543d1f73f3c3e9cf79 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 21 Aug 2016 12:01:26 +0100
Subject: efibootmgr: 0.12 -> 13

Fixes glib 2.24 build issues
---
 pkgs/tools/system/efibootmgr/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'pkgs/tools/system/efibootmgr')

diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 39fe1bdf09a..11418919e41 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -1,27 +1,22 @@
-{ stdenv, fetchFromGitHub, perl, efivar, pciutils, zlib }:
+{ stdenv, fetchFromGitHub, perl, efivar, pciutils, zlib, popt }:
 
 stdenv.mkDerivation rec {
   name = "efibootmgr-${version}";
-  version = "0.12";
+  version = "13";
 
-  buildInputs = [ perl efivar pciutils zlib ];
+  buildInputs = [ perl efivar pciutils zlib popt ];
 
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efibootmgr";
-    rev = name;
-    sha256 = "0fmrsp67dln76896fvxalj2pamyp9dszf32kl06wdfi0km42z8sh";
+    rev = version;
+    sha256 = "1kwmvx111c3a5783kx3az76mkhpr1nsdx0yv09gp4k0hgzqlqj96";
   };
 
   NIX_CFLAGS_COMPILE = "-I${efivar}/include/efivar";
-  NIX_LDFLAGS = "-lefiboot -lefivar";
+  NIX_LDFLAGS = "-lefiboot -lefivar -lpopt";
 
-  postPatch = ''
-    substituteInPlace "./tools/install.pl" \
-      --replace "/usr/bin/perl" "${perl}/bin/perl"
-  '';
-
-  installFlags = [ "BINDIR=$(out)/sbin" ];
+  installFlags = [ "prefix=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
-- 
cgit 1.4.1