diff options
author | Soispha <soispha@vhack.eu> | 2023-05-26 08:52:39 +0200 |
---|---|---|
committer | Soispha <soispha@vhack.eu> | 2023-05-26 08:52:39 +0200 |
commit | b33a86303986047f56b574118842296b80302913 (patch) | |
tree | 89a7728a05531cbf663efb1c5537ba554caabfac /flake | |
parent | Docs(todo): Update (diff) | |
download | nixos-config-b33a86303986047f56b574118842296b80302913.tar.gz nixos-config-b33a86303986047f56b574118842296b80302913.zip |
Fix(host/marduk): Override the iso name, to avoid a merge conflict
Diffstat (limited to 'flake')
-rw-r--r-- | flake/default.nix | 5 | ||||
-rw-r--r-- | flake/packages/default.nix | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/flake/default.nix b/flake/default.nix index 834d0b0c..b3e18ca7 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -112,7 +112,10 @@ in { agenix ; }; - packages."${system}" = import ./packages {inherit nixos-generators defaultSpecialArgs pkgs sysLib;}; + packages."${system}" = import ./packages { + inherit nixos-generators defaultSpecialArgs pkgs sysLib; + inherit (pkgs) lib; + }; apps."${system}" = import ./apps {inherit self system;}; diff --git a/flake/packages/default.nix b/flake/packages/default.nix index 666fa20a..8ca00e98 100644 --- a/flake/packages/default.nix +++ b/flake/packages/default.nix @@ -4,6 +4,7 @@ defaultSpecialArgs, pkgs, sysLib, + lib, ... }: { iso = nixos-generators.nixosGenerate { |