build: Add pkgs to set

To be able to easily extract packages/buildPackages easier when creating overrides.
pyproject-nix · Feb 13, 2025 · 3ee4005 · 3ee4005
1 parent 9b43213
commit 3ee4005
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/build/packages.nix b/build/packages.nix
@@ -27,9 +27,15 @@ let
       stdenv,
       pythonPkgsBuildHost,
       pkgsFinal,
+      pkgs,
     }:
     {
-      inherit python stdenv pythonPkgsBuildHost;
+      inherit
+        python
+        pkgs
+        stdenv
+        pythonPkgsBuildHost
+        ;
 
       # Initialize dependency resolvers
       resolveBuildSystem = mkResolveBuildSystem pythonPkgsBuildHost;
@@ -90,6 +96,7 @@ in
   newScope,
   buildPackages,
   stdenv,
+  pkgs,
 }:
 makeScope newScope (
   final:
@@ -139,7 +146,7 @@ makeScope newScope (
       throw "${name} ${spec}";
   }
   // (mkPythonSet {
-    inherit python stdenv;
+    inherit python stdenv pkgs;
     pkgsFinal = final;
     pythonPkgsBuildHost = final.pythonPkgsHostHost;
   })
@@ -156,6 +163,7 @@ makeScope newScope (
             python = python.pythonOnBuildForHost;
             inherit (final) pythonPkgsBuildHost;
             inherit pkgsFinal;
+            pkgs = buildPackages;
           }
         ))
       else

diff --git a/flake.nix b/flake.nix
@@ -159,12 +159,14 @@
             pkgs.runCommand "typing-check"
               {
                 nativeBuildInputs = [
-                  (pkgs.basedpyright.overrideAttrs(old: {
+                  (pkgs.basedpyright.overrideAttrs (old: {
                     # Nixpkgs build of basedpyright is broken because of a dangling symlinks check
-                    postInstall = old.postInstall + ''
+                    postInstall =
+                      old.postInstall
+                      + ''
 
-                      find -L $out -type l -print -delete
-                    '';
+                        find -L $out -type l -print -delete
+                      '';
                   }))
                   pkgs.python3
                 ];