diff options
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/release.nix b/release.nix index 737da9b..709cc43 100644 --- a/release.nix +++ b/release.nix @@ -1,8 +1,9 @@ -{ nixpkgs ? (import <nixpkgs> {}) }: -with nixpkgs; +{ nixpkgs ? <nixpkgs> }: +with import <nixpkgs/lib>; let + pkgs = import nixpkgs {}; + stdenv = pkgs.stdenv; pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; - stdenv = nixpkgs.stdenv; makeSystemTarball = { module, maintainers ? ["viric"], system }: @@ -19,7 +20,7 @@ let }).config; tarball = import <nixpkgs/nixos/lib/make-system-tarball.nix> { - inherit stdenv perl xz pathsFromGraph; + inherit (pkgs) stdenv perl xz pathsFromGraph; contents = []; extraArgs = "--owner=0"; @@ -31,7 +32,7 @@ let ] ++ (pkgs2storeContents [ stdenv ]); # Some container managers like lxc need these - extraCommands = writeScript "setup.sh" '' + extraCommands = pkgs.writeScript "setup.sh" '' mkdir -p proc sys dev sbin ln -s init sbin/init ''; |