From 1d854b479c74f0eb5e47a4241384a0146d268300 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 14 Mar 2018 15:47:09 +0200 Subject: [PATCH] edk2: Reformat a bit for readability - Have only one sed expression per line - Put the important stuff closer to the command and not hidden in some continuation line. That is, don't do: sed \ \ \ \ \ \ but: sed \ \ \ \ \ --- pkgs/development/compilers/edk2/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 4b87beb08794..5cc4846d3ae5 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -58,13 +58,20 @@ edk2 = stdenv.mkDerivation { configurePhase = '' mkdir -v Conf - sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \ - 's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\ - < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt - sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ + + cp ${edk2}/BaseTools/Conf/target.template Conf/target.txt + sed -i Conf/target.txt \ + -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' \ + -e 's|MYTOOLS|GCC49|' \ + -e 's|IA32|${targetArch}|' \ + -e 's|DEBUG|RELEASE|'\ + + cp ${edk2}/BaseTools/Conf/tools_def.template Conf/tools_def.txt + sed -i Conf/tools_def.txt \ + -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \ -e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \ - -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' \ - < ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt + -e 's|DEFINE UNIX_IASL_BIN = /usr/bin/iasl|DEFINE UNIX_IASL_BIN = ${iasl}/bin/iasl|' + export WORKSPACE="$PWD" export EFI_SOURCE="$PWD/EdkCompatibilityPkg" ln -sv ${edk2}/BaseTools BaseTools