BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkgs/stdenv/adapters.nix: Rename internal name

Browse source 
`finalAttrs` is never the first argument. This should have been
called `prevAttrs` all along.
It confused me for a bit, because the callback _must not_ be strict
in `finalAttrs` (the first of _two_ parameters), or it will
recurse infinitely while trying to figure out what the attrNames are.
This commit is contained in:
Robert Hensing 2024-03-21 13:51:50 +01:00
parent 8437d13b56
commit 8da01484cd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/stdenv/adapters.nix
View file

@ -144,10 +144,10 @@ rec {
# extraBuildInputs are dropped in cross.nix, but darwin still needs them # extraBuildInputs are dropped in cross.nix, but darwin still needs them
extraBuildInputs = [ pkgs.buildPackages.darwin.CF ]; extraBuildInputs = [ pkgs.buildPackages.darwin.CF ];
mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args:
(mkDerivationSuper args).overrideAttrs (finalAttrs: { (mkDerivationSuper args).overrideAttrs (prevAttrs: {
NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "") NIX_CFLAGS_LINK = toString (prevAttrs.NIX_CFLAGS_LINK or "")
+ lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc"; + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc";
nativeBuildInputs = (finalAttrs.nativeBuildInputs or []) nativeBuildInputs = (prevAttrs.nativeBuildInputs or [])
++ lib.optionals stdenv.hasCC [ ++ lib.optionals stdenv.hasCC [
(pkgs.buildPackages.makeSetupHook { (pkgs.buildPackages.makeSetupHook {
name = "darwin-portable-libSystem-hook"; name = "darwin-portable-libSystem-hook";