build2

packages/edk2-basetools/default.nix

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
     chmod -R u+w .
 
-    patchShebangs ./source
+    patchShebangs ./edk2
 
     runHook postUnpack
   '';
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # enable compilation using Clang
     # https://bugzilla.tianocore.org/show_bug.cgi?id=4620
-    substituteInPlace source/BaseTools/Conf/tools_def.template --replace-fail \
+    substituteInPlace edk2/BaseTools/Conf/tools_def.template --replace-fail \
       'DEFINE CLANGPDB_WARNING_OVERRIDES    = ' \
       'DEFINE CLANGPDB_WARNING_OVERRIDES    = -Wno-unneeded-internal-declaration '
       
-    substituteInPlace source/BaseTools/Conf/tools_def.template \
+    substituteInPlace edk2/BaseTools/Conf/tools_def.template \
       --replace "-Werror" "-Werror -Wno-error=format-security"
   '';
 
@@ -65,15 +65,15 @@ stdenv.mkDerivation rec {
     export PYTHON_COMMAND=${python3}/bin/python
     export WORKSPACE=$PWD
 
-    make -C ./source/BaseTools
+    make -C ./edk2/BaseTools
   '';
 
   installPhase = ''
     runHook preInstall
 
     mkdir -vp $out
-    mv -v ./source/BaseTools $out
-    mv -v ./source/edksetup.sh $out
+    mv -v ./edk2/BaseTools $out
+    mv -v ./edk2/edksetup.sh $out
     # patchShebangs fails to see these when cross compiling
     for i in $out/BaseTools/BinWrappers/PosixLike/*; do
       chmod +x "$i"