mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-28 16:17:42 +03:00
Merge pull request #9636 from ragnard/rkt-fix-build
rkt: Don't download stage1 image during build.
This commit is contained in:
commit
66429fa043
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
coreosImageRelease = "738.1.0";
|
coreosImageRelease = "738.1.0";
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
version = "0.8.0";
|
version = "0.8.0";
|
||||||
name = "rkt-${version}";
|
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";
|
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
|
||||||
sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0";
|
sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
|
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
./autogen.sh
|
./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 = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp -Rv build-rkt-${version}/bin/* $out/bin
|
cp -Rv build-rkt-${version}/bin/* $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A fast, composable, and secure App Container runtime for Linux";
|
description = "A fast, composable, and secure App Container runtime for Linux";
|
||||||
homepage = http://rkt.io;
|
homepage = http://rkt.io;
|
||||||
|
Loading…
Reference in New Issue
Block a user