LnL7/nix-darwin
1
1
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-11-13 04:56:53 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #215 from basvandijk/installer-correct-referencees

Browse Source 
darwin-[un]installer: make sure all dependencies are part of the closure
This commit is contained in:
Daiderd Jordan 2020-08-26 18:21:07 +02:00 committed by GitHub
commit 943a6b25d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
default.nix
View File

@ -24,6 +24,17 @@ let
# Was moved in nixpkgs #82751, so both need to be handled here until 20.03 is deprecated.
# https://github.com/NixOS/nixpkgs/commits/dcdd232939232d04c1132b4cc242dd3dac44be8c
_module = eval._module or eval.config._module;
# The source code of this repo needed by the [un]installers.
nix-darwin = pkgs.lib.cleanSource (
pkgs.lib.cleanSourceWith {
# We explicitly specify a name here otherwise `cleanSource` will use the
# basename of ./. which might be different for different clones of this
# repo leading to non-reproducible outputs.
name = "nix-darwin";
src = ./.;
}
);
in
{
@ -32,6 +43,6 @@ in
system = eval.config.system.build.toplevel;
installer = pkgs.callPackage ./pkgs/darwin-installer {};
uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller {};
installer = pkgs.callPackage ./pkgs/darwin-installer { inherit nix-darwin; };
uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { inherit nix-darwin; };
}

16
pkgs/darwin-installer/default.nix
View File

@ -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.

14
pkgs/darwin-uninstaller/default.nix
View File

@ -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