summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-05-04 00:08:20 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2021-05-06 11:17:26 -0400
commit470640e7fe53ab57396cff6698125f5bf137b4de (patch)
tree997d59f58f7def8d04cdafbe5e30e6e59881bb81 /pkgs/development/interpreters
parentb418e17a4ccf42b1a99aa6eca2b86a5b552d081a (diff)
downloadnixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar
nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.gz
nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.bz2
nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.lz
nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.xz
nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.tar.zst
nixpkgs-470640e7fe53ab57396cff6698125f5bf137b4de.zip
treewide: Do a number of no-op cleanups for cross and darwin
I am taking the non-invasive parts of #110914 to hopefully help out with #111988.

In particular:

 - Use `lib.makeScopeWithSplicing` to make the `darwin` package set have
   a proper `callPackage`.

 - Adjust Darwin `stdenv`'s overlays keeping things from the previous
   stage to not stick around too much.

 - Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us
   closer to a unified LLVM and GCC bootstrap.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/python/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index d74e017d830..5f13418aa58 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -69,6 +69,7 @@ with pkgs;
               recursivePthLoader
             ;
           };
+          extra = _: {};
           optionalExtensions = cond: as: if cond then as else [];
           python2Extension = import ../../../top-level/python2-packages.nix;
           extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);
@@ -77,6 +78,7 @@ with pkgs;
           pkgs.newScope
           otherSplices
           keep
+          extra
           (lib.extends extensions pythonPackagesFun))
         {
           overrides = packageOverrides;