feat: expose pkgs through flake

konradmalik · Feb 3, 2025 · 8011054 · 8011054
1 parent c28bb3f
commit 8011054
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/flake/packages.nix b/flake/packages.nix
@@ -8,27 +8,29 @@
   perSystem =
     { pkgs, ... }:
     {
-      packages = pkgs.lib.optionalAttrs (pkgs.stdenvNoCC.isLinux) (
-        let
-          rpiSdCard = "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix";
-          # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243
-          missingKernelModulesFix = {
-            nixpkgs.overlays = [
-              (final: prev: { makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; }); })
+      packages =
+        (import ../pkgs/installable { inherit pkgs; })
+        // pkgs.lib.optionalAttrs (pkgs.stdenvNoCC.isLinux) (
+          let
+            rpiSdCard = "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix";
+            # https://github.com/NixOS/nixpkgs/issues/126755#issuecomment-869149243
+            missingKernelModulesFix = {
+              nixpkgs.overlays = [
+                (final: prev: { makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; }); })
+              ];
+            };
+            modules = [
+              rpiSdCard
+              missingKernelModulesFix
             ];
-          };
-          modules = [
-            rpiSdCard
-            missingKernelModulesFix
-          ];
-        in
-        {
-          installer-iso = import ./../pkgs/special/installer-iso { inherit pkgs specialArgs; };
-          rpi4-1-sd-image =
-            (self.nixosConfigurations.rpi4-1.extendModules { inherit modules; }).config.system.build.sdImage;
-          rpi4-2-sd-image =
-            (self.nixosConfigurations.rpi4-2.extendModules { inherit modules; }).config.system.build.sdImage;
-        }
-      );
+          in
+          {
+            installer-iso = import ./../pkgs/special/installer-iso { inherit pkgs specialArgs; };
+            rpi4-1-sd-image =
+              (self.nixosConfigurations.rpi4-1.extendModules { inherit modules; }).config.system.build.sdImage;
+            rpi4-2-sd-image =
+              (self.nixosConfigurations.rpi4-2.extendModules { inherit modules; }).config.system.build.sdImage;
+          }
+        );
     };
 }