treewide: allow patches everywhere

thiagokokada · Dec 11, 2024 · f6932bb · f6932bb
1 parent a118d39
commit f6932bb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 14 deletions.
diff --git a/flake.nix b/flake.nix
@@ -211,11 +211,8 @@
       (flake-utils.lib.eachDefaultSystem (
         system:
         let
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-            overlays = [ self.overlays.default ];
-          };
+          n = import ./patches { inherit self nixpkgs system; };
+          inherit (n) pkgs;
         in
         {
           devShells.default = pkgs.mkShell {

diff --git a/lib/flake-helpers.nix b/lib/flake-helpers.nix
@@ -70,10 +70,13 @@ in
     }:
     let
       inherit (self.outputs.nixosConfigurations.${hostname}) config;
-      n = import ../patches { inherit nixpkgs system; };
+      n = import ../patches { inherit self nixpkgs system; };
 
       nixosSystem =
-        if n.patched then import (n.nixpkgs + "/nixos/lib/eval-config.nix") else n.nixpkgs.lib.nixosSystem;
+        if n.patched then
+          (import (n.nixpkgs + "/nixos/lib/eval-config.nix"))
+        else
+          n.nixpkgs.lib.nixosSystem;
     in
     {
       nixosConfigurations.${hostname} = nixosSystem {
@@ -109,14 +112,18 @@ in
   mkNixDarwinConfig =
     {
       hostname,
+      system ? "aarch64-darwin",
       nix-darwin ? inputs.nix-darwin,
+      nixpkgs ? inputs.nixpkgs,
       extraModules ? [ ],
     }:
     let
-      inherit (self.outputs.darwinConfigurations.${hostname}) pkgs;
+      n = import ../patches { inherit self nixpkgs system; };
+      inherit (n) pkgs;
     in
     {
       darwinConfigurations.${hostname} = nix-darwin.lib.darwinSystem {
+        inherit pkgs system;
         modules = [
           (
             { lib, ... }:
@@ -154,6 +161,7 @@ in
       deviceType ? "desktop",
       extraModules ? [ ],
       system ? "x86_64-linux",
+      nixpkgs ? inputs.nixpkgs,
       home-manager ? inputs.home-manager,
       # This value determines the Home Manager release that your
       # configuration is compatible with. This helps avoid breakage
@@ -165,9 +173,12 @@ in
       # changes in each release.
       stateVersion ? "24.05",
     }:
+    let
+      n = import ../patches { inherit self nixpkgs system; };
+    in
     {
       homeConfigurations.${hostname} = home-manager.lib.homeManagerConfiguration {
-        pkgs = self.outputs.legacyPackages.${system};
+        inherit (n) pkgs;
         modules = [
           (
             { ... }:

diff --git a/patches/default.nix b/patches/default.nix
@@ -1,8 +1,18 @@
-{ nixpkgs, system, ... }:
+{
+  self,
+  nixpkgs,
+  system,
+  ...
+}:
 let
-  inherit (nixpkgs.legacyPackages.${system}) applyPatches callPackage;
-  patches = callPackage ./patches.nix { };
-  nixpkgs' = applyPatches {
+  args = {
+    inherit system;
+    config.allowUnfree = true;
+    overlays = [ self.overlays.default ];
+  };
+  pkgs = import nixpkgs args;
+  patches = pkgs.callPackage ./patches.nix { };
+  nixpkgs' = pkgs.applyPatches {
     inherit patches;
     name = "nixpkgs-patched";
     src = nixpkgs;
@@ -12,9 +22,10 @@ if patches != [ ] then
   {
     patched = true;
     nixpkgs = nixpkgs';
+    pkgs = import nixpkgs' args;
   }
 else
   {
     patched = false;
-    inherit nixpkgs;
+    inherit nixpkgs pkgs;
   }