about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2012-03-14 22:43:07 +0000
committerShea Levy <shea@shealevy.com>2012-03-14 22:43:07 +0000
commit6c99fad938540b78d6b1cf878d32bed7515a74e0 (patch)
tree3618c8b939a5bbb3f6c7b59d6aeee5a58918d1b2
parent003b24ac4566785201b9516b3c842ffdb2c1c5d4 (diff)
OMVF: Only need some of the sources, and symlinks instead of copies are fine
svn path=/nixpkgs/trunk/; revision=33090
-rw-r--r--pkgs/applications/virtualization/OVMF/default.nix10
-rw-r--r--pkgs/development/compilers/edk2/default.nix2
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 4b6f77f5f8ddd..7d101aac790bd 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -14,10 +14,12 @@ in
 stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
   name = "OVMF-2012-03-13";
 
-  src = edk2.src;
-  
-  patchPhase = ''
-    rm -fR Conf BaseTools EdkCompatibilityPkg
+  unpackPhase = ''
+    for file in \
+      "${edk2.src}"/{OvmfPkg,UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};
+    do
+      ln -sv "$file" .
+    done
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 047834bbb6278..53517e853e946 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -64,7 +64,7 @@ edk2 = stdenv.mkDerivation {
         build
       ";
 
-      installPhase = "mv -v Build $out";
+      installPhase = "mv -v Build/*/* $out";
     } // (removeAttrs attrs [ "buildInputs" ] );
   };
 };