Merge branch 'refind' into upstream

This commit is contained in:
Shea Levy 2012-10-07 17:54:30 -04:00
commit 2f8ab5e651
3 changed files with 9 additions and 9 deletions

View file

@ -14,8 +14,8 @@ edk2 = stdenv.mkDerivation {
src = fetchsvn {
url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
rev = "13094";
sha256 = "1qfpal0y4sas204ydg3pg3634dm25q1vr94mpgmbdh6yqcviah3h";
rev = "13783";
sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
};
buildInputs = [ libuuid pythonFull ];

View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation {
name = "gnu-efi-3.0p";
name = "gnu-efi-3.0r";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0p.orig.tar.gz";
sha256 = "1pm4wk1gma7mb8z19js7kb5y31a0zk308mkafmq6gb0b2a0i39cn";
url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz";
sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5";
};
meta = {

View file

@ -1,22 +1,22 @@
{ stdenv, fetchurl, gnu_efi, unzip }:
let version = "0.2.3"; in
let version = "0.4.5"; in
stdenv.mkDerivation {
name = "refind-${version}";
src = fetchurl {
url = "mirror://sourceforge/refind/refind-src-${version}.zip";
sha256 = "0q3p4mczr6wchk4vbgsb0cq7829vk3b3kg9qaizrb02pdak3s2nf";
sha256 = "05nbalsl5csgph0v2amzgay9k2vzm47z8n1n6blbh9hvb7j5vn2c";
};
buildInputs = [ unzip ];
buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" ];
buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" "LOCAL_CFLAGS=-I${gnu_efi}/include" ];
installPhase = ''
mkdir -pv $out
install -v -m644 refind/refind.efi refind.conf-sample $out
install -v -m644 refind/refind*.efi refind.conf-sample $out
mv -v icons $out
'';