summary refs log tree commit diff
path: root/pkgs/applications/virtualization/rkt
diff options
context:
space:
mode:
authorRagnar Dahlén <r.dahlen@gmail.com>2015-09-03 14:04:59 +0100
committerRagnar Dahlén <r.dahlen@gmail.com>2015-09-03 14:07:50 +0100
commit1942480e95a47b1d4d749fd4f1bff155102c741f (patch)
tree826a03fe19df52a315f90cf6dd34a6caa0d64025 /pkgs/applications/virtualization/rkt
parent51d7cb6b1c7575a9b7df6efdf707442bf7435a51 (diff)
downloadnixlib-1942480e95a47b1d4d749fd4f1bff155102c741f.tar
nixlib-1942480e95a47b1d4d749fd4f1bff155102c741f.tar.gz
nixlib-1942480e95a47b1d4d749fd4f1bff155102c741f.tar.bz2
nixlib-1942480e95a47b1d4d749fd4f1bff155102c741f.tar.lz
nixlib-1942480e95a47b1d4d749fd4f1bff155102c741f.tar.xz
nixlib-1942480e95a47b1d4d749fd4f1bff155102c741f.tar.zst
nixlib-1942480e95a47b1d4d749fd4f1bff155102c741f.zip
rkt: Don't download stage1 image during build.
Second attempt to resolve this issue. Copies stage1 image into expected
place manually. This has been improved in rkt master where there is a
configure option for specifying the location of this file. Can update
when next stable rkt is released.
Diffstat (limited to 'pkgs/applications/virtualization/rkt')
-rw-r--r--pkgs/applications/virtualization/rkt/default.nix17
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index e873608733ac..1d03eece46c8 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -3,7 +3,7 @@
 
 let
   coreosImageRelease = "738.1.0";
-  
+
 in stdenv.mkDerivation rec {
   version = "0.8.0";
   name = "rkt-${version}";
@@ -19,20 +19,25 @@ in stdenv.mkDerivation rec {
     url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
     sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0";
   };
-  
+
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
-  
+
   preConfigure = ''
     ./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
     cp -Rv build-rkt-${version}/bin/* $out/bin
   '';
-    
+
   meta = with lib; {
     description = "A fast, composable, and secure App Container runtime for Linux";
     homepage = http://rkt.io;