From b33a86303986047f56b574118842296b80302913 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Fri, 26 May 2023 08:52:39 +0200
Subject: Fix(host/marduk): Override the iso name, to avoid a merge conflict

---
 flake/default.nix          | 5 ++++-
 flake/packages/default.nix | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'flake')

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 {
-- 
cgit 1.4.1