Compare commits

...

5 commits

4 changed files with 36 additions and 17 deletions

View file

@ -1,5 +1,5 @@
function nix-build function nix-build
if type -q nix-build if type -q nom-build
nom-build $argv nom-build $argv
else else
nix-build $argv nix-build $argv

View file

@ -1,5 +1,5 @@
function nix-shell function nix-shell
if type -q nix-shell if type -q nom-shell
nom-shell $argv nom-shell $argv
else else
nix-shell $argv nix-shell $argv

View file

@ -51,9 +51,10 @@ final: prev: rec {
}; };
weights = { weights = {
# Build 580, but indicate 400 in output
Regular.shape = 580; Regular.shape = 580;
Regular.menu = 580; Regular.menu = 400;
Regular.css = 580; Regular.css = 400;
Bold.shape = 700; Bold.shape = 700;
Bold.menu = 700; Bold.menu = 700;
Bold.css = 700; Bold.css = 700;

View file

@ -13,20 +13,38 @@ let
withNotify = false; withNotify = false;
}; };
keepNixOverride = # * overrides the nix input as nix-monitored
# * any override changing the nix input will change that to nix-monitored
use-nix-monitored =
drv: drv:
drv let
// { drv' = drv.override { nix = nix-monitored; };
override = args: drv.override (builtins.removeAttrs args [ "nix" ]); in
drv'
// rec {
override =
args:
let
args' =
if args ? nix then
args
// {
nix = nix-monitored.override { inherit (args) nix; };
}
else
args;
in
(drv'.override args') // { inherit override; };
}; };
inherit (prev) lib;
in in
{ lib.optionalAttrs (prev ? nixos-rebuild) {
nixos-rebuild-ng = keepNixOverride ( nixos-rebuild = use-nix-monitored prev.nixos-rebuild;
prev.nixos-rebuild-ng.override { }
nix = nix-monitored; // lib.optionalAttrs (prev ? nixos-rebuild-ng) {
} nixos-rebuild-ng = use-nix-monitored prev.nixos-rebuild-ng;
); }
nix-direnv = prev.nix-direnv.override { // {
nix = nix-monitored; nix-direnv = use-nix-monitored prev.nix-direnv;
};
} }