BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #147125 from felixsinger/pkgs/coreboot-toolchain/fix-building

Browse source 
coreboot-toolchain: Fix building
This commit is contained in:
Andreas Rammhold 2021-11-24 00:47:13 +01:00 committed by GitHub
commit 806b8b46db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
pkgs/development/tools/misc/coreboot-toolchain/default.nix
View file

@ -1,72 +1,77 @@
{ bison
, callPackage
, curl
, fetchgit
, flex
, getopt
, git
, gnat11
, lib
, perl
, stdenvNoCC
, zlib
}:
{ lib, callPackage }:
let
common = arch: stdenvNoCC.mkDerivation rec {
pname = "coreboot-toolchain-${arch}";
version = "4.15";
common = arch: callPackage (
{ bison
, callPackage
, curl
, fetchgit
, flex
, getopt
, git
, gnat11
, lib
, perl
, stdenvNoCC
, zlib
}:
src = fetchgit {
url = "https://review.coreboot.org/coreboot";
rev = version;
sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9";
fetchSubmodules = false;
leaveDotGit = true;
postFetch = ''
patchShebangs $out/util/crossgcc/buildgcc
PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version
rm -rf $out/.git
stdenvNoCC.mkDerivation rec {
pname = "coreboot-toolchain-${arch}";
version = "4.15";
src = fetchgit {
url = "https://review.coreboot.org/coreboot";
rev = version;
sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9";
fetchSubmodules = false;
leaveDotGit = true;
postFetch = ''
patchShebangs $out/util/crossgcc/buildgcc
PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version
rm -rf $out/.git
'';
};
nativeBuildInputs = [ bison curl git perl ];
buildInputs = [ flex gnat11 zlib ];
enableParallelBuilding = true;
dontConfigure = true;
dontInstall = true;
postPatch = ''
mkdir -p util/crossgcc/tarballs
${lib.concatMapStringsSep "\n" (
file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}"
) (callPackage ./stable.nix { })
}
patchShebangs util/genbuild_h/genbuild_h.sh
'';
};
nativeBuildInputs = [ bison curl git perl ];
buildInputs = [ flex gnat11 zlib ];
buildPhase = ''
export CROSSGCC_VERSION=$(cat .crossgcc_version)
make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out
'';
enableParallelBuilding = true;
dontConfigure = true;
dontInstall = true;
meta = with lib; {
homepage = "https://www.coreboot.org";
description = "coreboot toolchain for ${arch} targets";
license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ];
maintainers = with maintainers; [ felixsinger ];
platforms = platforms.linux;
};
}
);
in
postPatch = ''
mkdir -p util/crossgcc/tarballs
${lib.concatMapStringsSep "\n" (
file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}"
) (callPackage ./stable.nix { })
}
patchShebangs util/genbuild_h/genbuild_h.sh
'';
buildPhase = ''
export CROSSGCC_VERSION=$(cat .crossgcc_version)
make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out
'';
meta = with lib; {
homepage = "https://www.coreboot.org";
description = "coreboot toolchain for ${arch} targets";
license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ];
maintainers = with maintainers; [ felixsinger ];
platforms = platforms.linux;
};
};
in {
i386 = common "i386";
x86_64 = common "x64";
arm = common "arm";
aarch64 = common "aarch64";
riscv = common "riscv";
ppc64 = common "ppc64";
nds32le = common "nds32le";
}
lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch {})) [
"i386"
"x64"
"arm"
"aarch64"
"riscv"
"ppc64"
"nds32le"
])

2
pkgs/top-level/all-packages.nix
View file

@ -12091,7 +12091,7 @@ with pkgs;
pscid = nodePackages.pscid;
coreboot-toolchain = callPackages ../development/tools/misc/coreboot-toolchain { };
coreboot-toolchain = recurseIntoAttrs (callPackage ../development/tools/misc/coreboot-toolchain { });
remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { };