Merge: glibc: allow easier overriding of linux headers package (#413735)

authored by Maximilian Bosch and committed by GitHub bf817a01 f1a85c37

+3 -1
+1
pkgs/development/libraries/glibc/common.nix
··· 260 261 // (removeAttrs args [ 262 "withLinuxHeaders" 263 "withGd" 264 "enableCET" 265 "postInstall"
··· 260 261 // (removeAttrs args [ 262 "withLinuxHeaders" 263 + "linuxHeaders" 264 "withGd" 265 "enableCET" 266 "postInstall"
+2 -1
pkgs/development/libraries/glibc/default.nix
··· 3 stdenv, 4 callPackage, 5 withLinuxHeaders ? true, 6 profilingLibraries ? false, 7 withGd ? false, 8 enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false, ··· 19 ]; 20 in 21 22 - (callPackage ./common.nix { inherit stdenv; } { 23 inherit 24 withLinuxHeaders 25 withGd
··· 3 stdenv, 4 callPackage, 5 withLinuxHeaders ? true, 6 + linuxHeaders ? null, 7 profilingLibraries ? false, 8 withGd ? false, 9 enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false, ··· 20 ]; 21 in 22 23 + (callPackage ./common.nix { inherit stdenv linuxHeaders; } { 24 inherit 25 withLinuxHeaders 26 withGd