mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

Merge pull request #1410 from Enzime/push-kklymxxksrnp

Browse source 
nix-tools: re‐add `nixPackage`
This commit is contained in:
Michael Hoang 2025-03-31 00:54:11 +09:00 • committed by GitHub
commit eaff8219d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/nix/nix-darwin.nix
View file

@ -5,6 +5,7 @@ let
inherit (config.system) profile;
inherit (config.environment) systemPath;
nixPath = lib.optionalString config.nix.enable (lib.concatStringsSep ":" config.nix.nixPath);
nixPackage = if config.nix.enable then config.nix.package else null;
};
darwin-uninstaller = pkgs.callPackage ../../pkgs/darwin-uninstaller { };

3
pkgs/nix-tools/default.nix
View file

@ -21,6 +21,7 @@
"/usr/sbin"
"/sbin"
]
, nixPackage ? null
, # This should be kept in sync with the default `nix.nixPath`.
nixPath ? lib.concatStringsSep ":" [
"darwin-config=/etc/nix-darwin/configuration.nix"
@ -29,7 +30,7 @@
}:
let
extraPath = lib.makeBinPath [ coreutils jq git ];
extraPath = lib.makeBinPath [ coreutils jq git nixPackage ];
writeProgram = name: env: src:
substituteAll ({