pyrox.dev / nixpkgs
lol
fork atom

refind: 0.12.0 -> 0.13.0 (#113328)

authored by

Samuel Dionne-Riel and committed by
GitHub 7260e7c1 b29675a5

+8 -30
unified split
-25
pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch
··· 1 - From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 2 - From: srs5694 <srs5694@users.sourceforge.net> 3 - Date: Fri, 15 May 2020 12:34:14 -0400 4 - Subject: [PATCH] Fix GCC 10 compile problem 5 - 6 - --- 7 - Make.common | 2 +- 8 - 1 file changed, 1 insertion(+), 1 deletion(-) 9 - 10 - diff --git a/Make.common b/Make.common 11 - index 3f0b919..95a3a97 100644 12 - --- a/Make.common 13 - +++ b/Make.common 14 - @@ -60,7 +60,7 @@ endif 15 - # 16 - 17 - # ...for both GNU-EFI and TianoCore.... 18 - -OPTIMFLAGS = -Os -fno-strict-aliasing 19 - +OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns 20 - CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall 21 - 22 - # ...for GNU-EFI.... 23 - -- 24 - 2.29.2 25 -
···
+8 -5
pkgs/tools/bootloaders/refind/default.nix
··· 14 15 stdenv.mkDerivation rec { 16 pname = "refind"; 17 - version = "0.12.0"; 18 - srcName = "refind-src-${version}"; 19 20 src = fetchurl { 21 - url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; 22 - sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v"; 23 }; 24 25 patches = [ 26 ./0001-toolchain.patch 27 - ./0001-Fix-GCC-10-compile-problem.patch 28 ]; 29 30 buildInputs = [ gnu-efi ]; ··· 44 buildFlags = [ "gnuefi" "fs_gnuefi" ]; 45 46 installPhase = '' 47 install -d $out/bin/ 48 install -d $out/share/refind/drivers_${efiPlatform}/ 49 install -d $out/share/refind/tools_${efiPlatform}/ ··· 102 sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install 103 sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind 104 sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont 105 ''; 106 107 meta = with lib; {
··· 14 15 stdenv.mkDerivation rec { 16 pname = "refind"; 17 + version = "0.13.0"; 18 19 src = fetchurl { 20 + url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; 21 + sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65"; 22 }; 23 24 patches = [ 25 + # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. 26 ./0001-toolchain.patch 27 ]; 28 29 buildInputs = [ gnu-efi ]; ··· 43 buildFlags = [ "gnuefi" "fs_gnuefi" ]; 44 45 installPhase = '' 46 + runHook preInstall 47 + 48 install -d $out/bin/ 49 install -d $out/share/refind/drivers_${efiPlatform}/ 50 install -d $out/share/refind/tools_${efiPlatform}/ ··· 103 sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install 104 sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind 105 sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont 106 + 107 + runHook postInstall 108 ''; 109 110 meta = with lib; {