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

nix-tools: drop nixPackage

Browse source 
We already put `/nix/var/nix/profiles/default/bin` on the `$PATH`,
and whatever `nix.package` is set to already gets installed into
`/run/current-system/sw/bin`, so this is pointless.
This commit is contained in:
Emily 2025-01-11 15:44:41 +00:00
parent 87131f51f8
commit 02232f71c5
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,6 @@ let
nix-tools = pkgs.callPackage ../../pkgs/nix-tools { nix-tools = pkgs.callPackage ../../pkgs/nix-tools {
inherit (config.system) profile; inherit (config.system) profile;
inherit (config.environment) systemPath; inherit (config.environment) systemPath;
nixPackage = config.nix.package;
}; };
darwin-uninstaller = pkgs.callPackage ../../pkgs/darwin-uninstaller { }; darwin-uninstaller = pkgs.callPackage ../../pkgs/darwin-uninstaller { };

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

@ -5,12 +5,11 @@
, substituteAll , substituteAll
, stdenv , stdenv
, profile ? "/nix/var/nix/profiles/system" , profile ? "/nix/var/nix/profiles/system"
, nixPackage ? "/nix/var/nix/profiles/default"
, systemPath ? "$HOME/.nix-profile/bin:/etc/profiles/per-user/$USER/bin:/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" , systemPath ? "$HOME/.nix-profile/bin:/etc/profiles/per-user/$USER/bin:/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
}: }:
let let
extraPath = lib.makeBinPath [ nixPackage coreutils jq git ]; extraPath = lib.makeBinPath [ coreutils jq git ];
writeProgram = name: env: src: writeProgram = name: env: src:
substituteAll ({ substituteAll ({