b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

stdenv/adapters.nix: Fix for overlay style arguments

Browse source
This commit is contained in:
Robert Hensing 2022-06-05 13:51:57 +02:00
parent 2db97cb047
commit dd770cc211
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/stdenv/adapters.nix
View file

@ -21,7 +21,7 @@ let
# Wrap the original `mkDerivation` providing extra args to it. # Wrap the original `mkDerivation` providing extra args to it.
extendMkDerivationArgs = old: f: withOldMkDerivation old (_: mkDerivationSuper: args: extendMkDerivationArgs = old: f: withOldMkDerivation old (_: mkDerivationSuper: args:
mkDerivationSuper (args // f args)); (mkDerivationSuper args).overrideAttrs f);
# Wrap the original `mkDerivation` transforming the result. # Wrap the original `mkDerivation` transforming the result.
overrideMkDerivationResult = old: f: withOldMkDerivation old (_: mkDerivationSuper: args: overrideMkDerivationResult = old: f: withOldMkDerivation old (_: mkDerivationSuper: args:
@ -60,10 +60,10 @@ rec {
mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args:
if stdenv.hostPlatform.isDarwin if stdenv.hostPlatform.isDarwin
then throw "Cannot build fully static binaries on Darwin/macOS" then throw "Cannot build fully static binaries on Darwin/macOS"
else mkDerivationSuper (args // { else (mkDerivationSuper args).overrideAttrs(finalAttrs: {
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "") + " -static";
} // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { } // lib.optionalAttrs (!(finalAttrs.dontAddStaticConfigureFlags or false)) {
configureFlags = (args.configureFlags or []) ++ [ configureFlags = (finalAttrs.configureFlags or []) ++ [
"--disable-shared" # brrr... "--disable-shared" # brrr...
]; ];
})); }));