From f4ce59cee0d3a5ecf0c026f054db0a51879a04e9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 5 Jan 2014 07:38:39 -0500 Subject: [PATCH] Remove non-kernel-specific klibc derivation Signed-off-by: Shea Levy --- pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix index 9b2949e3e368..aeea4b53c15c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix @@ -83,7 +83,7 @@ let isl = pkgs.isl.crossDrv; mpc = pkgs.mpc.crossDrv; binutils = pkgs.binutils.crossDrv; - klibc = pkgs.klibc.crossDrv; + klibc = pkgs.linuxPackages.klibc.crossDrv; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6846af91de6f..30aa8dbbc40f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6940,10 +6940,6 @@ let lsiutil = callPackage ../os-specific/linux/lsiutil { }; - klibc = callPackage ../os-specific/linux/klibc { - linuxHeaders = glibc.kernelHeaders; - }; - klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); kmod = callPackage ../os-specific/linux/kmod { };