diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:37:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:38:04 +0200 |
commit | 9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch) | |
tree | 946e5c7626f668079bcf35caf203a52c5d33f3c7 /pkgs/tools/system/efivar/default.nix | |
parent | cf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff) | |
parent | 967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff) | |
download | nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2 nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip |
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'pkgs/tools/system/efivar/default.nix')
-rw-r--r-- | pkgs/tools/system/efivar/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index d0c84d52daa..a9c3ebd0252 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "14c8x9dhi4scj42n1cf513b551c1ccm8lwpaqx8h8ydpm2k35qi4"; + sha256 = "0iakv8prvl61mb2wnll02sxlg3kfzh3d4qb41d0bklmnljjkqr8p"; }; buildInputs = [ popt ]; - # 0.20 Relies on symbols from libdl.so which breaks efibootmgr - NIX_LDFLAGS = "-ldl"; + # 0.21 Has build warnings so disable -Werror + postPatch = '' + sed -i 's,-Werror,,g' Make.defaults + ''; installFlags = [ "libdir=$(out)/lib" |