summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2017-05-20 13:16:55 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2017-05-20 13:16:55 -0400
commit45af71df9554c19c14f6efc65efca18fbf013e32 (patch)
tree54c8a5d14f88cea3dea7c521cf85b875617cbc9d
parentce78bf5656fe5221eb0ee38d197aeac96012f4d1 (diff)
release.nix: Fix
-rw-r--r--release.nix11
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
'';