From 04b30b2397439168af4854b4a7a9cd58c1e72b70 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 22 Jul 2016 18:18:29 -0700 Subject: rkt: fix default stage1 location --- pkgs/applications/virtualization/rkt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/virtualization/rkt') diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index b2add237ae88..e33ce9361adf 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -9,6 +9,7 @@ let # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. stage1Flavours = [ "coreos" "fly" ]; + stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { version = "1.11.0"; @@ -41,6 +42,7 @@ in stdenv.mkDerivation rec { --with-coreos-local-pxe-image-path=${stage1BaseImage} --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion} " else "" } + --with-stage1-default-location=$out/${stage1Dir}/stage1-${builtins.elemAt stage1Flavours 0}.aci ); ''; @@ -53,7 +55,7 @@ in stdenv.mkDerivation rec { cp -Rv $BUILDDIR/target/bin/rkt $out/bin mkdir -p $out/lib/rkt/stage1-images/ - cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/lib/rkt/stage1-images/ + cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ wrapProgram $out/bin/rkt \ --prefix LD_LIBRARY_PATH : ${systemd}/lib \ -- cgit 1.4.1