public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rkt: fix default stage1 location

Browse Source
This commit is contained in:
Stefan Junker 2016-07-22 18:18:29 -07:00
parent abc3faa294
commit 04b30b2397
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/rkt/default.nix
View File

@ -9,6 +9,7 @@ let
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
stage1Flavours = [ "coreos" "fly" ]; stage1Flavours = [ "coreos" "fly" ];
stage1Dir = "lib/rkt/stage1-images";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.11.0"; version = "1.11.0";
@ -41,6 +42,7 @@ in stdenv.mkDerivation rec {
--with-coreos-local-pxe-image-path=${stage1BaseImage} --with-coreos-local-pxe-image-path=${stage1BaseImage}
--with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion} --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion}
" else "" } " 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 cp -Rv $BUILDDIR/target/bin/rkt $out/bin
mkdir -p $out/lib/rkt/stage1-images/ 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 \ wrapProgram $out/bin/rkt \
--prefix LD_LIBRARY_PATH : ${systemd}/lib \ --prefix LD_LIBRARY_PATH : ${systemd}/lib \