podman: includes missing edk2-aarch64-code.fd on aarch64-darwin

NixOS · Mar 6, 2022 · 24d04d8 · 24d04d8
1 parent a13a62d
commit 24d04d8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
@@ -13,6 +13,7 @@
 , systemd
 , go-md2man
 , nixosTests
+, qemu
 }:
 
 buildGoModule rec {
@@ -44,6 +45,14 @@ buildGoModule rec {
     systemd
   ];
 
+  patches = lib.optional (stdenv.isDarwin && stdenv.isAarch64) [
+    ./fix-edk2-aarch64-darwin.patch
+  ];
+
+  postPatch = lib.optional (stdenv.isDarwin && stdenv.isAarch64) ''
+    substituteAllInPlace pkg/machine/qemu/options_darwin_arm64.go;
+  '';
+
   buildPhase = ''
     runHook preBuild
     patchShebangs .
@@ -74,6 +83,9 @@ buildGoModule rec {
     PREFIX=$out make install.completions
     MANDIR=$man/share/man make install.man
     runHook postInstall
+  '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
+      mkdir $out/share/qemu
+      ln -s ${qemu}/share/qemu/edk2-aarch64-code.fd $out/share/qemu
   '';
 
   postFixup = lib.optionalString stdenv.isLinux ''

diff --git a/pkgs/applications/virtualization/podman/fix-edk2-aarch64-darwin.patch b/pkgs/applications/virtualization/podman/fix-edk2-aarch64-darwin.patch
@@ -0,0 +1,13 @@
+diff --git a/pkg/machine/qemu/options_darwin_arm64.go b/pkg/machine/qemu/options_darwin_arm64.go
+--- a/pkg/machine/qemu/options_darwin_arm64.go
++++ b/pkg/machine/qemu/options_darwin_arm64.go
+@@ -45,8 +45,7 @@ func getOvmfDir(imagePath, vmName string) string {
+  */
+ func getEdk2CodeFd(name string) string {
+ 	dirs := []string{
+-		"/usr/local/share/qemu",
+-		"/opt/homebrew/share/qemu",
++		"@out@/share/qemu",
+ 	}
+ 	for _, dir := range dirs {
+ 		fullpath := filepath.Join(dir, name)