diff --git a/flake.nix b/flake.nix index d7d6f71..9d685a8 100644 --- a/flake.nix +++ b/flake.nix @@ -108,8 +108,11 @@ in { inherit inputs; - packages = forAllSystems({ pkgs, ... }: { - mpv-webm = pkgs.callPackage ./pkgs/mpv-webm.nix {}; # https://github.com/NixOS/nixpkgs/pull/238659 + packages = forAllSystems({ pkgs, flakes, ... }: { + mpv-webm = pkgs.callPackage ./pkgs/mpv-webm.nix {}; # TODO: https://github.com/NixOS/nixpkgs/pull/238659 + nixos-rebuild-nom = with pkgs; writeScriptBin "nixos-rebuild" '' + exec ${nixos-rebuild}/bin/nixos-rebuild "$@" |& ${nix-output-monitor}/bin/nom + ''; }); lib = { @@ -142,11 +145,8 @@ devShells = forAllSystems ({ pkgs, flakes, ... }: let mkShell = packages: pkgs.mkShell { inherit packages; }; - nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" '' - exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild "$@" |& ${pkgs.nix-output-monitor}/bin/nom - ''; envrc-pkgs = [ - nixos-rebuild-nom + flakes.self.pkgs.nixos-rebuild-nom pkgs.home-manager pkgs.nix-output-monitor pkgs.cachix @@ -159,7 +159,7 @@ pkgs.rsync ]); remoteenv = mkShell [ - nixos-rebuild-nom + flakes.self.pkgs.nixos-rebuild-nom ]; });