diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-02-16 22:19:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 04:19:46 +0100 |
| commit | 7260e7c1e81358bb2ba415413495b8b738612ac8 (patch) | |
| tree | e1fa1096112cf17809037a9a6ff82e77fd1bc7bc /pkgs/tools/bootloaders | |
| parent | b29675a5531e99baff404bd6ddfbe57244fc46b3 (diff) | |
| download | nixpkgs-7260e7c1e81358bb2ba415413495b8b738612ac8.tar nixpkgs-7260e7c1e81358bb2ba415413495b8b738612ac8.tar.gz nixpkgs-7260e7c1e81358bb2ba415413495b8b738612ac8.tar.bz2 nixpkgs-7260e7c1e81358bb2ba415413495b8b738612ac8.tar.lz nixpkgs-7260e7c1e81358bb2ba415413495b8b738612ac8.tar.xz nixpkgs-7260e7c1e81358bb2ba415413495b8b738612ac8.tar.zst nixpkgs-7260e7c1e81358bb2ba415413495b8b738612ac8.zip | |
refind: 0.12.0 -> 0.13.0 (#113328)
Diffstat (limited to 'pkgs/tools/bootloaders')
| -rw-r--r-- | pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch | 25 | ||||
| -rw-r--r-- | pkgs/tools/bootloaders/refind/default.nix | 13 |
2 files changed, 8 insertions, 30 deletions
diff --git a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch deleted file mode 100644 index 90b60235aad..00000000000 --- a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 -From: srs5694 <srs5694@users.sourceforge.net> -Date: Fri, 15 May 2020 12:34:14 -0400 -Subject: [PATCH] Fix GCC 10 compile problem - ---- - Make.common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Make.common b/Make.common -index 3f0b919..95a3a97 100644 ---- a/Make.common -+++ b/Make.common -@@ -60,7 +60,7 @@ endif - # - - # ...for both GNU-EFI and TianoCore.... --OPTIMFLAGS = -Os -fno-strict-aliasing -+OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns - CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall - - # ...for GNU-EFI.... --- -2.29.2 - diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 9c36e55b8f2..eac55d6beae 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -14,17 +14,16 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.12.0"; - srcName = "refind-src-${version}"; + version = "0.13.0"; src = fetchurl { - url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; - sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v"; + url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; + sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65"; }; patches = [ + # Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds. ./0001-toolchain.patch - ./0001-Fix-GCC-10-compile-problem.patch ]; buildInputs = [ gnu-efi ]; @@ -44,6 +43,8 @@ stdenv.mkDerivation rec { buildFlags = [ "gnuefi" "fs_gnuefi" ]; installPhase = '' + runHook preInstall + install -d $out/bin/ install -d $out/share/refind/drivers_${efiPlatform}/ install -d $out/share/refind/tools_${efiPlatform}/ @@ -102,6 +103,8 @@ stdenv.mkDerivation rec { sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont + + runHook postInstall ''; meta = with lib; { |