Merge pull request #9636 from ragnard/rkt-fix-build

rkt: Don't download stage1 image during build.
2015-09-03 15:16:26 +02:00 · 2015-09-03 15:16:26 +02:00 · 66429fa043
parent ecd873ddb0 1942480e95
commit 66429fa043
1 changed files with 11 additions and 6 deletions
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@ -26,7 +26,12 @@ in stdenv.mkDerivation rec {
    ./autogen.sh
  '';

-  configureFlags = "--with-stage1-image-path=${stage1image}";
+  preBuild = ''
+    # hack to avoid downloading image during build, this has been
+    # improved in rkt master
+    mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos
+    cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img
+  '';

  installPhase = ''
    mkdir -p $out/bin