From 6309f4813717e426084c127c5659aad7a66cf8b0 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Fri, 15 Jan 2016 13:11:08 +0000
Subject: [PATCH] rkt: 0.14.0 -> 0.15.0
---
nixos/modules/virtualisation/rkt.nix | 2 ++
.../virtualization/rkt/default.nix | 18 ++++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix
index 7b4d46e0749..c4c5cb3380e 100644
--- a/nixos/modules/virtualisation/rkt.nix
+++ b/nixos/modules/virtualisation/rkt.nix
@@ -58,5 +58,7 @@ in
ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}";
};
};
+
+ users.extraGroups.rkt = {};
};
}
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index abdbb46bc5b..43228b255a2 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
-, fetchurl, fetchFromGitHub }:
+{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
+ cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
let
coreosImageRelease = "794.1.0";
coreosImageSystemdVersion = "222";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
- stage1Flavours = [ "coreos" "fly" ];
+ stage1Flavours = [ "coreos" "fly" "host" ];
in stdenv.mkDerivation rec {
- version = "0.14.0";
+ version = "0.15.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
rev = "v${version}";
owner = "coreos";
repo = "rkt";
- sha256 = "0dmgs9s40xhan2rh9f5n0k5gv8p2dn946zffq02sq35qqvi67s71";
+ sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
};
stage1BaseImage = fetchurl {
@@ -25,7 +25,10 @@ in stdenv.mkDerivation rec {
sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
};
- buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
+ buildInputs = [
+ autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
+ makeWrapper
+ ];
preConfigure = ''
./autogen.sh
@@ -45,6 +48,9 @@ in stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -Rv $BUILDDIR/bin/* $out/bin
+ wrapProgram $out/bin/rkt \
+ --prefix LD_LIBRARY_PATH : ${systemd}/lib \
+ --prefix PATH : ${iptables}/bin
'';
meta = with lib; {