diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2020-08-14 23:25:26 +0200 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2020-08-21 21:22:09 +0200 |
| commit | 03d39316567b2c63a803fc12c0cb4abfc0e40bdd (patch) | |
| tree | b06866ddcf1e63725eb81c60f6bbd35642a75e1b /pkgs | |
| parent | 47fe6db9c9cd22c4ba57df3281f98f454880bea7 (diff) | |
darwin-[un]installer: make sure all dependencies are part of the closure
This makes sure the `darwin-installer` and `darwin-uninstaller`
packages can be nix copied to any target and reliably be executed
there.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/darwin-installer/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/darwin-uninstaller/default.nix | 14 |
2 files changed, 21 insertions, 9 deletions
diff --git a/pkgs/darwin-installer/default.nix b/pkgs/darwin-installer/default.nix index 8b05d2a..f2c18e4 100644 --- a/pkgs/darwin-installer/default.nix +++ b/pkgs/darwin-installer/default.nix @@ -1,10 +1,16 @@ -{ stdenv, writeScript, nix, pkgs }: +{ stdenv, writeScript, nix, pkgs, nix-darwin }: let + configuration = builtins.path { + name = "nix-darwin-installer-configuration"; + path = ./.; + filter = name: _type: name != toString ./default.nix; + }; + nixPath = stdenv.lib.concatStringsSep ":" [ - "darwin-config=${toString ./configuration.nix}" - "darwin=${toString ../..}" - "nixpkgs=${toString pkgs.path}" + "darwin-config=${configuration}/configuration.nix" + "darwin=${nix-darwin}" + "nixpkgs=${pkgs.path}" "$HOME/.nix-defexpr/channels" "/nix/var/nix/profiles/per-user/root/channels" "$NIX_PATH" @@ -52,7 +58,7 @@ stdenv.mkDerivation { if ! test -f "$config"; then echo "copying example configuration.nix" >&2 mkdir -p "$HOME/.nixpkgs" - cp "${toString ../../modules/examples/simple.nix}" "$config" + cp "${../../modules/examples/simple.nix}" "$config" chmod u+w "$config" # Enable nix-daemon service for multi-user installs. diff --git a/pkgs/darwin-uninstaller/default.nix b/pkgs/darwin-uninstaller/default.nix index 13e4c08..088bf1d 100644 --- a/pkgs/darwin-uninstaller/default.nix +++ b/pkgs/darwin-uninstaller/default.nix @@ -1,10 +1,16 @@ -{ stdenv, nix, pkgs }: +{ stdenv, nix, pkgs, nix-darwin }: let + configuration = builtins.path { + name = "nix-darwin-uninstaller-configuration"; + path = ./.; + filter = name: _type: name != toString ./default.nix; + }; + nixPath = stdenv.lib.concatStringsSep ":" [ - "darwin-config=${toString ./configuration.nix}" - "darwin=${toString ../..}" - "nixpkgs=${toString pkgs.path}" + "darwin-config=${configuration}/configuration.nix" + "darwin=${nix-darwin}" + "nixpkgs=${pkgs.path}" "$NIX_PATH" ]; in |