From d3fb7acb3a653c8a24dc5ea4de6b4da0f4c346ac Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 27 Feb 2016 09:29:15 +0000 Subject: [PATCH] dietlibc: fix merge failure --- pkgs/os-specific/linux/dietlibc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix index 3d206cb5f77..09d7651c249 100644 --- a/pkgs/os-specific/linux/dietlibc/default.nix +++ b/pkgs/os-specific/linux/dietlibc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { builder = ./builder.sh; inherit glibc; - kernelHeaders = glibc.kernelHeaders; + kernelHeaders = glibc.linuxHeaders; hardening_stackprotector = false; patches = [