From 05482c6b799344b813a4b55dd6ebb402c61b28b7 Mon Sep 17 00:00:00 2001 From: Winter Date: Tue, 3 Jun 2025 17:56:12 -0400 Subject: [PATCH] glibc: allow easier overriding of linux headers package Before this change, one would have to `callPackage` `common.nix` manually, but now this can be done via `glibc.override`. --- pkgs/development/libraries/glibc/common.nix | 1 + pkgs/development/libraries/glibc/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5117d420463b..18e7d84477f7 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -260,6 +260,7 @@ stdenv.mkDerivation ( // (removeAttrs args [ "withLinuxHeaders" + "linuxHeaders" "withGd" "enableCET" "postInstall" diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index d165cb8fff62..fc76ebe9ae05 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -3,6 +3,7 @@ stdenv, callPackage, withLinuxHeaders ? true, + linuxHeaders ? null, profilingLibraries ? false, withGd ? false, enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false, @@ -19,7 +20,7 @@ let ]; in -(callPackage ./common.nix { inherit stdenv; } { +(callPackage ./common.nix { inherit stdenv linuxHeaders; } { inherit withLinuxHeaders withGd