diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 01:04:05 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 01:04:05 +0400 |
| commit | d140851472e90da38627d948f1c23b9e24856b77 (patch) | |
| tree | 004ff944f3c9652f6bfb0d64bd1da9724b50f8eb /nixos/lib | |
| parent | 23b3495a253aa4e029cc48ea09629ab1243d9fa5 (diff) | |
| parent | 296888b1bcb0b3eb641167973c87686a9103b0dd (diff) | |
| download | nixlib-d140851472e90da38627d948f1c23b9e24856b77.tar nixlib-d140851472e90da38627d948f1c23b9e24856b77.tar.gz nixlib-d140851472e90da38627d948f1c23b9e24856b77.tar.bz2 nixlib-d140851472e90da38627d948f1c23b9e24856b77.tar.lz nixlib-d140851472e90da38627d948f1c23b9e24856b77.tar.xz nixlib-d140851472e90da38627d948f1c23b9e24856b77.tar.zst nixlib-d140851472e90da38627d948f1c23b9e24856b77.zip | |
Merge pull request #3779 from offlinehacker/docker
full nixos inside docker
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-system-tarball.nix | 5 | ||||
| -rw-r--r-- | nixos/lib/make-system-tarball.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index 8fed9a348827..3bd891fdbc2b 100644 --- a/nixos/lib/make-system-tarball.nix +++ b/nixos/lib/make-system-tarball.nix @@ -15,6 +15,9 @@ # store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the tarball. storeContents ? [] + + # Extra tar arguments +, extraArgs ? "" }: stdenv.mkDerivation { @@ -22,7 +25,7 @@ stdenv.mkDerivation { builder = ./make-system-tarball.sh; buildInputs = [perl xz]; - inherit fileName pathsFromGraph; + inherit fileName pathsFromGraph extraArgs; # !!! should use XML. sources = map (x: x.source) contents; diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 096d96ac1c81..2eb668115a6f 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -50,7 +50,7 @@ done mkdir -p $out/tarball -tar cvJf $out/tarball/$fileName.tar.xz * +tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs mkdir -p $out/nix-support echo $system > $out/nix-support/system |