From afe6cc0f5be2276e98b466dbd24b311b07bc08dc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 21:39:19 -0400 Subject: [PATCH] test --- flake.nix | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 7c23d9d..0802f7f 100644 --- a/flake.nix +++ b/flake.nix @@ -66,21 +66,24 @@ "yarn" ]; - # pkgs = - # (import nixpkgs { - # }).applyPatches - # { - # name = "nixpkgs"; - # src = inputs.nixpkgs; - # patches = [ - # # https://github.com/NixOS/nixpkgs/pull/67576 - # # gimp 3.0 - # (builtins.fetchurl { - # url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - # sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; - # }) - # ]; - # }; + pkgs = import ( + (import nixpkgs { + inherit system; + }).applyPatches + { + name = "nixpkgs"; + src = inputs.nixpkgs; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/67576 + # gimp 3.0 + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; + sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; + }) + ]; + } + ) { inherit system; }; + in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; @@ -90,7 +93,12 @@ // { "${hostname}" = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs username hostname; + inherit + inputs + username + hostname + pkgs + ; }; modules = [ home-manager.nixosModules.home-manager