summaryrefslogtreecommitdiff
path: root/default.nix
diff options
context:
space:
mode:
authorMike Vink <59492084+ivi-vink@users.noreply.github.com>2025-01-16 22:22:34 +0100
committerGitHub <noreply@github.com>2025-01-16 22:22:34 +0100
commit8e7bd91f353caacc0bc4105f573eb3e17f09e03a (patch)
treec5059edcbebd9644290cad7c653c49a36d593021 /default.nix
parent6bd39d420578aacf7c0bab7de3e7027b952115ae (diff)
parentbd921223ba7cdac346477d7ea5204d6f4736fcc6 (diff)
Merge branch 'LnL7:master' into masterHEADmaster
Diffstat (limited to 'default.nix')
-rw-r--r--default.nix21
1 files changed, 5 insertions, 16 deletions
diff --git a/default.nix b/default.nix
index c93b478..8bae7e1 100644
--- a/default.nix
+++ b/default.nix
@@ -1,8 +1,8 @@
{ nixpkgs ? <nixpkgs>
, configuration ? <darwin-config>
-, lib ? pkgs.lib
-, pkgs ? import nixpkgs { inherit system; }
, system ? builtins.currentSystem
+, pkgs ? import nixpkgs { inherit system; }
+, lib ? pkgs.lib
}:
let
@@ -15,20 +15,9 @@ let
nixpkgs.system = lib.mkDefault system;
};
};
-
- # The source code of this repo needed by the installer.
- nix-darwin = lib.cleanSource (
- 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
-
eval // {
- installer = pkgs.callPackage ./pkgs/darwin-installer { inherit nix-darwin; };
- uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { };
+ darwin-uninstaller = pkgs.callPackage ./pkgs/darwin-uninstaller { };
+
+ inherit (pkgs.callPackage ./pkgs/nix-tools { }) darwin-option darwin-rebuild darwin-version;
}