M-Labs/zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests Releases Wiki Activity

flake: fix fsbl build

Browse Source
This commit is contained in:
mwojcik 2022-01-26 16:35:22 +08:00
parent 8a84d0bbf0
commit 1cc4a33fce
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -29,7 +29,7 @@
# ==== rustPlatform / gnutoolchain # ==== rustPlatform / gnutoolchain
gnu-platform = "arm-none-eabi"; gnu-platform = "arm-none-eabi";
binutils-pkg = { extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec { binutils-pkg = { zlib, extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec {
basename = "binutils"; basename = "binutils";
version = "2.30"; version = "2.30";
name = "${basename}-${gnu-platform}-${version}"; name = "${basename}-${gnu-platform}-${version}";
@ -47,7 +47,7 @@
] ++ extraConfigureFlags; ] ++ extraConfigureFlags;
outputs = [ "out" "info" "man" ]; outputs = [ "out" "info" "man" ];
depsBuildBuild = [ pkgs.buildPackages.stdenv.cc ]; depsBuildBuild = [ pkgs.buildPackages.stdenv.cc ];
buildInputs = [ pkgs.lib.zlib ]; buildInputs = [ zlib ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
description = "Tools for manipulating binaries (linker, assembler, etc.)"; description = "Tools for manipulating binaries (linker, assembler, etc.)";
@ -65,7 +65,7 @@
}; };
}; };
gcc-pkg = { platform-binutils, extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec { gcc-pkg = { gmp, mpfr, libmpc, platform-binutils, extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec {
basename = "gcc"; basename = "gcc";
version = "9.1.0"; version = "9.1.0";
name = "${basename}-${gnu-platform}-${version}"; name = "${basename}-${gnu-platform}-${version}";
@ -90,7 +90,7 @@
"--with-ld=${platform-binutils}/bin/${gnu-platform}-ld" ] ++ extraConfigureFlags; "--with-ld=${platform-binutils}/bin/${gnu-platform}-ld" ] ++ extraConfigureFlags;
outputs = [ "out" "info" "man" ]; outputs = [ "out" "info" "man" ];
hardeningDisable = [ "format" "pie" ]; hardeningDisable = [ "format" "pie" ];
propagatedBuildInputs = with pkgs.libs; [ gmp mpfr libmpc platform-binutils ]; propagatedBuildInputs = [ gmp mpfr libmpc platform-binutils ];
enableParallelBuilding = true; enableParallelBuilding = true;
dontFixup = true; dontFixup = true;
}; };
@ -102,7 +102,7 @@
url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv"; sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv";
}; };
nativeBuildInputs = [ platform-binutils pkgs.platform-gcc ]; nativeBuildInputs = [ platform-binutils platform-gcc ];
configureFlags = [ configureFlags = [
"--target=${gnu-platform}" "--target=${gnu-platform}"

0
nix/fsbl.patch → fsbl.patch
View File