From 19c7b847995db9ce87a568a1fc06950dd957227c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 9 Oct 2013 10:07:02 -0400 Subject: [PATCH] gnu-efi: Update to 3.0u Signed-off-by: Shea Levy --- pkgs/development/libraries/gnu-efi/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index ca24db94cd0..f741a0b4f34 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,13 +2,13 @@ , fetchurl }: -let version = "3.0s"; in stdenv.mkDerivation { +let version = "3.0u"; in stdenv.mkDerivation { name = "gnu-efi-${version}"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; - sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh"; + sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w"; }; meta = { @@ -34,7 +34,7 @@ let version = "3.0s"; in stdenv.mkDerivation { ''; installPhase = '' - make INSTALLROOT="$out" install + make PREFIX="$out" install mkdir -pv $out/share/gnu-efi install -D -m644 apps/*.efi $out/share/gnu-efi ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64f9c29a5a4..99a489a5df2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4321,7 +4321,7 @@ let gnet = callPackage ../development/libraries/gnet { }; gnu-efi = callPackage ../development/libraries/gnu-efi { - stdenv = overrideInStdenv stdenv [gnumake381]; + stdenv = overrideGCC stdenv gcc47; }; gnutls = callPackage ../development/libraries/gnutls {