From 1e8b56f03bc18807310100a5b082b86c6ad17fbf Mon Sep 17 00:00:00 2001 From: Jan-Bulthuis Date: Tue, 11 Feb 2025 16:09:01 +0100 Subject: [PATCH] Moved from overrides to overlay for custom packages --- pkgs/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 9a1f4d5..a65bcac 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,14 +2,15 @@ ... }: -{ - nixpkgs.config = { - packageOverrides = pkgs: { - dina-vector = pkgs.callPackage ./fonts/dina-vector.nix { }; - dina-psf = pkgs.callPackage ./fonts/dina-psf.nix { }; - wqy-zenhei = pkgs.callPackage ./fonts/wqy-zenhei.nix { }; - wqy-microhei = pkgs.callPackage ./fonts/wqy-microhei.nix { }; - wqy-bitmapsong = pkgs.callPackage ./fonts/wqy-bitmapsong.nix { }; - }; +let + overlay = final: prev: { + dina-vector = prev.callPackage ./fonts/dina-vector.nix { }; + dina-psf = prev.callPackage ./fonts/dina-psf.nix { }; + wqy-zenhei = prev.callPackage ./fonts/wqy-zenhei.nix { }; + wqy-microhei = prev.callPackage ./fonts/wqy-microhei.nix { }; + wqy-bitmapsong = prev.callPackage ./fonts/wqy-bitmapsong.nix { }; }; +in +{ + nixpkgs.overlays = [ overlay ]; }