From a97f690dcce0db07df7735317d6bd9c76f9aad6f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 15 Nov 2020 15:42:39 +0100 Subject: darwin-rebuild: add jq to path for flakes --- modules/nix/nix-darwin.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/nix/nix-darwin.nix b/modules/nix/nix-darwin.nix index e6d887f..69da8e7 100644 --- a/modules/nix/nix-darwin.nix +++ b/modules/nix/nix-darwin.nix @@ -1,9 +1,12 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -let +with lib; +let inherit (pkgs) stdenv; + extraPath = lib.makeBinPath [ config.nix.package pkgs.coreutils pkgs.jq ]; + writeProgram = name: env: src: pkgs.substituteAll ({ inherit name src; @@ -22,10 +25,9 @@ let { inherit (config.system) profile; inherit (stdenv) shell; - path = "${pkgs.coreutils}/bin:${config.nix.package}/bin:${config.environment.systemPath}"; + path = "${extraPath}:${config.environment.systemPath}"; } ../../pkgs/nix-tools/darwin-rebuild.sh; - in { -- cgit v1.2.3