Skip to content

Commit

Permalink
Merge pull request #64 from adisbladis/nixpkgs-darwin-sdk-refactor
Browse files Browse the repository at this point in the history
Fix expression for recent Nixpkgs versions
  • Loading branch information
domenkozar authored Nov 4, 2024
2 parents 5e4f207 + f02b5b3 commit 8fcdb8e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,19 @@
"python${sourceVersion.major}${sourceVersion.minor}" = python;
};
};
python = (self.lib.applyOverrides overrides (callPackage "${pkgs.path}/pkgs/development/interpreters/python/cpython/${infix}default.nix" ({

pythonFun = import "${pkgs.path}/pkgs/development/interpreters/python/cpython/${infix}default.nix";
python = (self.lib.applyOverrides overrides (callPackage pythonFun ({
inherit sourceVersion;
inherit (pkgs.darwin) configd;
hash = null;
self = packages.${version};
passthruFun = callPackage "${pkgs.path}/pkgs/development/interpreters/python/passthrufun.nix" { };
} // lib.optionalAttrs (sourceVersion.major == "3") {
noldconfigPatch = ./patches + "/${sourceVersion.major}.${sourceVersion.minor}-no-ldconfig.patch";
} // lib.optionalAttrs (lib.functionArgs pythonFun ? configd) {
# Nixpkgs had a Darwin SDK refactor in 24.11 which removed configd from the Python derivation
# Only inject configd for older Nixpkgs where it's required.
inherit (pkgs.darwin) configd;
}))).overrideAttrs (old: {
src = pkgs.fetchurl {
inherit url;
Expand Down

0 comments on commit 8fcdb8e

Please sign in to comment.