Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0aeca5a7c760
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f6e1664e7d69
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 19, 2019

  1. refind: allows building for aarch64

    @samueldr
    samueldr committed May 19, 2019
    Copy the full SHA
    19c404c View commit details

Commits on Jun 5, 2019

  1. Merge pull request #61726 from samueldr/refind-aarch64 

    refind: allows building for aarch64
    @samueldr
    samueldr authored Jun 5, 2019
    Copy the full SHA
    f6e1664 View commit details
Showing with 34 additions and 1 deletion.
  1. +27 −0 pkgs/tools/bootloaders/refind/0001-toolchain.patch
  2. +7 −1 pkgs/tools/bootloaders/refind/default.nix
27 changes: 27 additions & 0 deletions pkgs/tools/bootloaders/refind/0001-toolchain.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/Make.common b/Make.common
index 3f0b919..ee365f5 100644
--- a/Make.common
+++ b/Make.common
@@ -33,22 +33,6 @@ ARCH ?= $(HOSTARCH)

# Note: TIANOBASE is defined in master Makefile and exported
GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw
-prefix = /usr/bin/
-ifeq ($(ARCH),aarch64)
- CC = $(prefix)aarch64-linux-gnu-gcc
- AS = $(prefix)aarch64-linux-gnu-as
- LD = $(prefix)aarch64-linux-gnu-ld
- AR = $(prefix)aarch64-linux-gnu-ar
- RANLIB = $(prefix)aarch64-linux-gnu-ranlib
- OBJCOPY = $(prefix)aarch64-linux-gnu-objcopy
-else
- CC = $(prefix)gcc
- AS = $(prefix)as
- LD = $(prefix)ld
- AR = $(prefix)ar
- RANLIB = $(prefix)ranlib
- OBJCOPY = $(prefix)objcopy
-endif

ifeq ($(MAKEWITH),TIANO)
# Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, GCC46, or GCC47)
8 changes: 7 additions & 1 deletion pkgs/tools/bootloaders/refind/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ let
archids = {
"x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; };
"i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; };
"aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; };
};

inherit
@@ -21,6 +22,10 @@ stdenv.mkDerivation rec {
sha256 = "1bjd0dl77bc5k6g3kc7s8m57vpbg2zscph9qh84xll9rc10g3fir";
};

patches = [
./0001-toolchain.patch
];

buildInputs = [ gnu-efi ];

hardeningDisable = [ "stackprotector" ];
@@ -32,6 +37,7 @@ stdenv.mkDerivation rec {
"GNUEFILIB=${gnu-efi}/lib"
"EFICRT0=${gnu-efi}/lib"
"HOSTARCH=${hostarch}"
"ARCH=${hostarch}"
];

buildFlags = [ "gnuefi" "fs_gnuefi" ];
@@ -116,7 +122,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://refind.sourceforge.net/;
maintainers = [ maintainers.AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
license = licenses.gpl3Plus;
};