movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

glibc: allow easier overriding of linux headers package

Browse source 
Before this change, one would have to `callPackage` `common.nix` manually,
but now this can be done via `glibc.override`.
This commit is contained in:
Winter 2025-06-03 17:56:12 -04:00
parent 0f64ecd19d
commit 05482c6b79
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/libraries/glibc/common.nix
View file

@ -260,6 +260,7 @@ stdenv.mkDerivation (
// (removeAttrs args [ // (removeAttrs args [
"withLinuxHeaders" "withLinuxHeaders"
"linuxHeaders"
"withGd" "withGd"
"enableCET" "enableCET"
"postInstall" "postInstall"

3
pkgs/development/libraries/glibc/default.nix
View file

@ -3,6 +3,7 @@
stdenv, stdenv,
callPackage, callPackage,
withLinuxHeaders ? true, withLinuxHeaders ? true,
linuxHeaders ? null,
profilingLibraries ? false, profilingLibraries ? false,
withGd ? false, withGd ? false,
enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false, enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false,
@ -19,7 +20,7 @@ let
]; ];
in in
(callPackage ./common.nix { inherit stdenv; } { (callPackage ./common.nix { inherit stdenv linuxHeaders; } {
inherit inherit
withLinuxHeaders withLinuxHeaders
withGd withGd