From fc6e5deea6dc5b2f0125f9ca52811219ec626d08 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Sun, 19 Jan 2025 19:35:06 -0600 Subject: [PATCH] add back flake inherited packages --- lib/extended.nix | 2 +- pkgs/default.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/extended.nix b/lib/extended.nix index 4665c4f..647c709 100644 --- a/lib/extended.nix +++ b/lib/extended.nix @@ -125,6 +125,7 @@ let module = nixosModuleFrom; pkgs = pkgsFromSystem system; pkg = pkgFromSystem system; + toPackageAttrs = flakesToPackagesAttrs system; }; loadOverlays = @@ -209,6 +210,5 @@ in hostFiles oizysSettings tryPkgsFromFile - flakesToPackagesAttrs ; } diff --git a/pkgs/default.nix b/pkgs/default.nix index fcb794c..3e0a898 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,7 +4,7 @@ ... }: let - inherit (lib) flakesToPackageAttrs flakeFromSystem; + inherit (lib) flakeFromSystem; flake = flakeFromSystem pkgs.system; in { @@ -20,8 +20,8 @@ in attic-server = (flake.pkgs "lix-attic").attic-server; lix = (flake.pkgs "lix-module").default; } -# // (flakesToPackageAttrs [ -# "pixi" -# "f1multiviewer" -# "tsm" -# ]) +// (flake.toPackageAttrs [ + "pixi" + "f1multiviewer" + "tsm" +])